Skip to content

S
smart_gov_platform
Commit 10a82f2a authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents eb56d0f7 a1450c97
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 15 deletions
base-manager/pom.xml
View file @ 10a82f2a
......@@ -13,10 +13,6 @@
<artifactId>base-manager</artifactId>
<packaging>jar</packaging>
<description>基础服务管理平台</description>
<properties>
</properties>
<profiles>
<profile>
<id>develop</id>
......@@ -149,6 +145,27 @@
</properties>
</profile>
<profile>
<id>yanyuan</id>
<properties>
<profiles.active>yanyuan</profiles.active>
<profiles.server.port>17211</profiles.server.port>
<profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>172.16.30.245</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>build</package.environment>
<skipUi>true</skipUi>
<profiles.holidayUrl>https://timor.tech/api/holiday/year/</profiles.holidayUrl>
</properties>
</profile>
</profiles>
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java
View file @ 10a82f2a
package com.mortals.xhx.module.matter.service;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.dao.MatterDatumDao;
import com.mortals.xhx.module.matter.dao.MatterExtDao;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import java.util.List;
/**
* MatterDatumService
* <p>
......@@ -16,4 +21,8 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
public interface MatterDatumService extends ICRUDService<MatterDatumEntity, Long> {
MatterDatumDao getDao();
List<MatterDatumEntity> findMatterList(MatterDatumEntity query , Context context);
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @ 10a82f2a
......@@ -83,4 +83,13 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
}
/**
* @param query
* @param context
* @return
*/
@Override
public List<MatterDatumEntity> findMatterList(MatterDatumEntity query, Context context) {
return null;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @ 10a82f2a
......@@ -4,22 +4,32 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
/**
* 事项申请材料
*
......@@ -92,4 +102,37 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
model.put(KEY_RESULT_DATA,collect);
return super.doListAfter(query, model, context);
}
/**
* 查询的材料 名称去重 并且
* @param query
* @return
*/
@PostMapping(value = "matterlist")
@UnAuth
public Rest<Object> matterlist(@RequestBody MatterDatumEntity query) {
Rest<Object> ret = new Rest<>();
Map<String, Object> model = new HashMap<>();
Context context = this.getContext();
String busiDesc = "查询材料" + this.getModuleDesc();
int code = VALUE_RESULT_SUCCESS;
try {
List<MatterDatumEntity> list = this.service.findMatterList(query, context);
model.put(KEY_RESULT_DATA, list);
model.put(MESSAGE_INFO, busiDesc + "成功");
if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
recordSysLog(request, busiDesc + " 【成功】");
}
} catch (Exception e) {
code = VALUE_RESULT_FAILURE;
this.doException(request, busiDesc, model, e);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
return ret;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowVo.java
View file @ 10a82f2a
package com.mortals.xhx.module.window.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.WindowBusinessEntity;
import com.mortals.xhx.module.window.model.WindowEntity;
import com.mortals.xhx.module.window.model.WindowMatterEntity;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 站点部门窗口视图对象
......@@ -33,4 +31,7 @@ public class WindowVo extends BaseEntityLong {
*/
private String hallName;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
}
\ No newline at end of file
base-manager/src/main/resources/application.yml
View file @ 10a82f2a
......@@ -3,7 +3,7 @@ spring:
allow-bean-definition-overriding: true
application:
log:
level: @profiles.log.level@
level: info
path: @profiles.log.path@
......
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml
View file @ 10a82f2a
......@@ -27,6 +27,8 @@
<result property="isList" column="isList" />
<result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" />
<result property="serviceApi" column="serviceApi" />
<result property="serviceApiParams" column="serviceApiParams" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
......@@ -57,7 +59,7 @@
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.fieldTypeValue,b.dataType,b.fieldValue,b.defaultValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,
b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.fieldTypeValue,b.dataType,b.fieldValue,b.defaultValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,b.serviceApi,b.serviceApiParams,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
......
base-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumController.http
View file @ 10a82f2a
......@@ -4,6 +4,8 @@ POST {{baseUrl}}/matter/datum/list
Content-Type: application/json
{
"materialName": "%违法%",
"page":1,
"size":10
}
......
portal-manager/pom.xml
View file @ 10a82f2a
......@@ -150,6 +150,28 @@
</properties>
</profile>
<profile>
<id>yanyuan</id>
<properties>
<profiles.active>yanyuan</profiles.active>
<profiles.server.port>17212</profiles.server.port>
<profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>172.16.30.245</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>build</package.environment>
<skipUi>true</skipUi>
<profiles.holidayUrl>https://timor.tech/api/holiday/year/</profiles.holidayUrl>
</properties>
</profile>
</profiles>
<properties>
......
portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleAuthServiceImpl.java
View file @ 10a82f2a
......@@ -103,7 +103,7 @@ public class RoleAuthServiceImpl extends AbstractCRUDServiceImpl<RoleAuthDao, Ro
condition.setRoleId(roleId);
List<RoleAuthEntity> roleModelEntities = this.find(condition);
if (CollectionUtils.isNotEmpty(roleModelEntities)) {
List<Long> menuIds = roleModelEntities.stream().map(RoleAuthEntity::getMenuId).collect(Collectors.toList());
List<Long> menuIds = roleModelEntities.stream().filter(m->m.getMenuId()!=null).map(RoleAuthEntity::getMenuId).collect(Collectors.toList());
MenuQuery query1 = new MenuQuery();
query1.setIdList(menuIds);
List<MenuEntity> menuEntities = menuService.find(query1);
......
portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleServiceImpl.java
View file @ 10a82f2a
......@@ -44,7 +44,7 @@ public class RoleServiceImpl extends AbstractCRUDServiceImpl<RoleDao, RoleEntity
@Override
protected void findAfter(RoleEntity entity, Context context, List<RoleEntity> list) throws AppException {
list.stream().forEach(item->{
List<Long> menuIds = roleAuthService.find(new RoleAuthQuery().roleId(item.getId())).stream().map(m -> m.getMenuId()).collect(Collectors.toList());
List<Long> menuIds = roleAuthService.find(new RoleAuthQuery().roleId(item.getId())).stream().filter(m->m.getMenuId()!=null).map(m -> m.getMenuId()).collect(Collectors.toList());
if(!ObjectUtils.isEmpty(menuIds)){
item.setMenuIdList(menuIds);
}
......
portal-manager/src/main/resources/application.yml
View file @ 10a82f2a
......@@ -3,7 +3,7 @@ spring:
allow-bean-definition-overriding: true
application:
log:
level: @profiles.log.level@
level: info
path: @profiles.log.path@
......
smart-gateway/pom.xml
View file @ 10a82f2a
......@@ -126,9 +126,6 @@
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>info</profiles.log.level>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
<profiles.holidayUrl>https://timor.tech/api/holiday/year/</profiles.holidayUrl>
</properties>
</profile>
......@@ -148,12 +145,31 @@
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>info</profiles.log.level>
</properties>
</profile>
<profile>
<id>yanyuan</id>
<properties>
<profiles.active>yanyuan</profiles.active>
<profiles.server.port>17214</profiles.server.port>
<profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>172.16.30.245</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
<profiles.log.level>info</profiles.log.level>
</properties>
</profile>
</profiles>
<properties>
......
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