浏览代码

修改test配置文件

syh 4 年之前
父节点
当前提交
b4a7eda2b9

+ 3 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.system.controller;
 
 
-import cn.com.ctop.common.module.annotation.PermissionData;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
@@ -114,25 +113,21 @@ public class SysUserController {
      * @param req
      * @return
      */
-    @PermissionData(pageComponent = "system/UserList")
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
-		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+		Result<IPage<SysUser>> result = new Result<>();
 		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-    	//TODO 外部模拟登陆临时账号,列表不显示
-        queryWrapper.ne("username","_reserve_user_external");
-		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+		Page<SysUser> page = new Page<>(pageNo, pageSize);
 		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
 
 		//批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids,一次性查询用户的所属部门名字
         List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
-        if(userIds!=null && userIds.size()>0){
+        if(!userIds.isEmpty()){
             Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
             pageList.getRecords().forEach(item->{
-                //TODO 临时借用这个字段用于页面展示
                 item.setOrgCode(useDepNames.get(item.getId()));
             });
         }

+ 27 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -49,4 +49,31 @@ public class AnnouncementSendModel implements Serializable {
      * 消息类型1:通知公告2:系统消息
      */
     private java.lang.String msgCategory;
+
+	/**
+	 * 业务id
+	 */
+	private java.lang.String busId;
+	/**
+	 * 业务类型
+	 */
+	private java.lang.String busType;
+	/**
+	 * 打开方式 组件:component 路由:url
+	 */
+	private java.lang.String openType;
+	/**
+	 * 组件/路由 地址
+	 */
+	private java.lang.String openPage;
+
+	/**
+	 * 业务类型查询(0.非bpm业务)
+	 */
+	private java.lang.String bizSource;
+
+	/**
+	 * 摘要
+	 */
+	private java.lang.String msgAbstract;
 }

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,7 +56,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
@@ -95,7 +95,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver

+ 4 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCreativeController.java

@@ -47,6 +47,7 @@ public class ByteDanceCreativeController {
     @ApiOperation(value = "今日头条创意信息-分页列表查询", notes = "今日头条创意信息-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<ByteDanceCreative>> queryPageList(
+            @RequestParam(name = "planId", required = false) Long planId,
             @RequestParam(name = "accountId", defaultValue = "0") Long accountId,
             @RequestParam(name = "status",required = false) String status,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -62,6 +63,9 @@ public class ByteDanceCreativeController {
         if(null!=accountId){
             queryWrapper.eq("account_id",accountId);
         }
+        if(null!=planId&&planId!=0){
+            queryWrapper.eq("plan_id",planId);
+        }
         if(null!=endDate&&!endDate.trim().equals("")){
             queryWrapper.le("",startDate+" 23:59:59");
         }