Skip to content

S
smart_gov_platform
Commit cf1351d8 authored by 赵啸非's avatar 赵啸非
Browse files
Options

测试流控功能

parent 44daaf65
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 74 deletions
base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/DataPermissionAspect.java
View file @ cf1351d8
......@@ -24,7 +24,7 @@ import java.util.List;
@Aspect
@Slf4j
//@Component
@Component
public class DataPermissionAspect {
@Autowired
......@@ -57,7 +57,6 @@ public class DataPermissionAspect {
List<DimensionResourceRuleEntity> componentRules = dimensionResourceRuleService.getRoleComponentRule(loginUser.getId(), componentRoute);
if (!ObjectUtils.isEmpty(componentRules)) {
//在request添加属性
//todo 构建数据权限sql 并设置到request中。
String permissionSql = RuleQueryGenerator.getPermissionSql(componentRules, loginUser);
log.info("permissionSql:{}", permissionSql);
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppInfoTempleteFieldServiceImpl.java
View file @ cf1351d8
......@@ -28,8 +28,6 @@ import java.util.List;
@Service("appInfoTempleteFieldService")
public class AppInfoTempleteFieldServiceImpl extends AbstractCRUDServiceImpl<AppInfoTempleteFieldDao, AppInfoTempleteFieldEntity, Long> implements AppInfoTempleteFieldService {
@Autowired
private AppService appService;
@Autowired
private AppDatasetService appDatasetService;
@Autowired
......@@ -46,7 +44,7 @@ public class AppInfoTempleteFieldServiceImpl extends AbstractCRUDServiceImpl<App
AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
appDatasetQuery.setAppId(entity.getAppId());
List<AppDatasetEntity> appDatasetEntities = appDatasetService.find(appDatasetQuery, context);
// 判断该数据集 是否已经存在 没存在 再添加
// 判断该数据集 是否已经存在 没存在 再添加
ArrayList<AppInfoFieldEntity> fieldSaveList = new ArrayList<>();
for (AppDatasetEntity appDatasetEntity : appDatasetEntities) {
......@@ -65,7 +63,6 @@ public class AppInfoTempleteFieldServiceImpl extends AbstractCRUDServiceImpl<App
fieldSaveList.add(fieldEntity);
}
}
if (!ObjectUtils.isEmpty(fieldSaveList)) {
appInfoFieldService.save(fieldSaveList, context);
}
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ cf1351d8
......@@ -296,12 +296,9 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
public Rest<String> cloneAppBySameSite(AppEntity appEntity, Context context) {
Long sourceAppId = appEntity.getSourceAppId();
Long targetAppId = appEntity.getTargetAppId();
AppEntity sourceAppEntity = this.get(sourceAppId, context);
AppEntity targetAppEntity = this.get(targetAppId, context);
//删除应用的数据集
if (!ObjectUtils.isEmpty(appEntity.getTargetDelete()) && YesNoEnum.YES.getValue() == appEntity.getTargetDelete()) {
Long[] delIds = targetAppEntity.getAppDatasetList().stream().map(i -> i.getId()).toArray(Long[]::new);
......@@ -394,9 +391,6 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
String originFilePath = appEntity.getFilePath();
String filePath = entity.getFilePath();
String fileName = entity.getFileName();
//entity.setFilePath(null);
//entity.setFileName(null);
//判断如果应用下架，通知自助服务终端
if (entity.getShelves() == YesNoEnum.NO.getValue()) {
AppPdu appPdu = new AppPdu();
......@@ -445,40 +439,6 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
}
/*
@Override
protected void updateAfter(AppEntity entity, Context context) throws AppException {
AppVersionQuery appVersionQuery = new AppVersionQuery();
appVersionQuery.setAppId(entity.getId());
List<OrderCol> orderColList = new ArrayList<>();
orderColList.add(new OrderCol("version", OrderCol.DESCENDING));
appVersionQuery.setOrderColList(orderColList);
List<AppVersionEntity> appVersionEntities = appVersionService.find(appVersionQuery, context);
//获取最大版本号
if (!ObjectUtils.isEmpty(appVersionEntities)) {
AppVersionEntity curAppVersionEntity = appVersionEntities.get(0);
// String versionNum = StrUtil.subAfter(curAppVersionEntity.getVersion(), Constant.VERSION_PREFIX, false);
Integer versionNum = curAppVersionEntity.getVersion();
Integer newVersionNum = ++versionNum;
AppVersionEntity appVersionEntity = new AppVersionEntity();
appVersionEntity.initAttrValue();
AppVersionEntity versionEntity = new AppVersionEntity();
versionEntity.initAttrValue();
versionEntity.setAppId(entity.getId());
versionEntity.setAppName(entity.getAppName());
versionEntity.setVersion(newVersionNum);
versionEntity.setNotes(entity.getNotes());
versionEntity.setFileName(entity.getFileName());
versionEntity.setFilePath(entity.getFilePath());
versionEntity.setDistributeFilePath(entity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context);
}
super.updateAfter(entity, context);
}*/
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
......@@ -506,7 +466,6 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
appInfoFieldService.remove(idList, context);
}
}
super.removeAfter(ids, context, result);
}
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java
View file @ cf1351d8
......@@ -35,8 +35,6 @@ import static com.mortals.framework.ap.SysConstains.*;
@RequestMapping("app/category")
public class AppCategoryController extends BaseCRUDJsonBodyMappingController<AppCategoryService,AppCategoryEntity,Long> {
@Autowired
private ParamService paramService;
public AppCategoryController(){
super.setModuleDesc( "自助终端应用分类");
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @ cf1351d8
......@@ -244,8 +244,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
public static void main(String[] args) {
/* String homeUrl = "app/1/2";
String domainUrl = "http://192.168.0.98:11078";
String s = UrlBuilder.of(domainUrl).addPath("app").addPath("1").addPath("2").toString();
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
View file @ cf1351d8
......@@ -119,8 +119,6 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
appDatasetQuery.setFieldCode(query.getFieldCode());
appDatasetQuery.setFieldName(query.getFieldName());
appDatasetQuery.setAppId(query.getAppId());
// String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
// fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
appDatasetQuery.setFieldValue(query.getFieldValue());
PageInfo pageInfo = this.buildPageInfo(query);
Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context);
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppVersionController.java
View file @ cf1351d8
......@@ -80,7 +80,6 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV
List<OrderCol> orderColList = new ArrayList<>();
orderColList.add(new OrderCol("version", OrderCol.DESCENDING));
query.setOrderColList(orderColList);
super.doListBefore(query, model, context);
}
......
base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessMatterServiceImpl.java
View file @ cf1351d8
......@@ -34,7 +34,7 @@ public class BusinessMatterServiceImpl extends AbstractCRUDServiceImpl<BusinessM
super.saveBefore(entity, context);
int count = this.getDao().getCount(new BusinessMatterQuery().siteBusinessId(entity.getSiteBusinessId()).matterId(entity.getMatterId()));
if(count>0){
throw new AppException("当前业务事项已存在，不能新增");
throw new AppException("当前业务事项已存在，不能新增!");
}
}
......
base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessServiceImpl.java
View file @ cf1351d8
......@@ -85,11 +85,7 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
@Override
protected void updateAfter(BusinessEntity entity, Context context) throws AppException {
Runnable runnable = new Runnable() {
/**
*
*/
@Override
public void run() {
//同步更新所有站点
......@@ -112,9 +108,7 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
if( !ObjectUtils.isEmpty(windowBusinessEntityList)) {
windowBusinessService.update(windowBusinessEntityList, context);
}
}
//通知第三方平台
String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
phpUrl += "/inter/device/baseDataSave";
......@@ -126,11 +120,9 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
apiThirdPartyReq.setStatus(ThirdPartyStatusEnum.修改.getValue());
apiThirdPartyReq.setData(bussinessThirdPartyReq);
messageService.sendThirdParty(phpUrl, JSON.toJSONString(apiThirdPartyReq));
}
};
ThreadPool.getInstance().execute(runnable);
super.updateAfter(entity, context);
}
......@@ -150,7 +142,7 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
for (BusinessEntity child : childList) {
if (!idSet.contains(child.getId())) {
bool = true;
break;
continue;
}
if (bool) {
throw new AppException("删除的父业务存在子业务，不能删除");
......@@ -171,8 +163,6 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
apiThirdPartyReq.setData(bussinessThirdPartyReq);
messageService.sendThirdParty(phpUrl, JSON.toJSONString(apiThirdPartyReq));
}
super.removeBefore(ids, context);
}
......@@ -233,8 +223,6 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
private void updateOrSave(BusinessEntity item, Long siteId, Context context) {
SiteBusinessEntity siteBusinessEntity = new SiteBusinessEntity();
// BeanUtils.copyProperties(item, siteBusinessEntity, BeanUtil.getNullPropertyNames(item));
SiteEntity siteEntity = siteService.get(siteId);
if (ObjectUtils.isEmpty(siteEntity)) {
throw new AppException("未找到相应站点！");
......
base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ cf1351d8
......@@ -280,15 +280,9 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
if (!ObjectUtils.isEmpty(siteMatterEntityList)) {
siteMatterService.update(siteMatterEntityList, context);
}
}
};
ThreadPool.getInstance().execute(runnable);
super.updateAfter(entity, context);
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @ cf1351d8
package com.mortals.xhx.module.device.web;
import com.mortals.framework.annotation.SlideWindowLimit;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
......@@ -38,4 +40,13 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
}
/**
* @param query
* @return
*/
@Override
@SlideWindowLimit
public Rest<Object> list(DeviceEntity query) {
return super.list(query);
}
}
\ 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