轮播、公告模块代码生成

sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/controller/rest/ConfigBannerRestController.java

@@ -0,0 +1,105 @@
+
+package io.platform.homepage.web.controller.rest;
+
+
+import io.platform.homepage.dto.ConfigBannerDto;
+import io.platform.homepage.web.remote.ConfigBannerServiceRemote;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.platform.base.common.controller.AbstractController;
+import io.platform.base.common.utils.R;
+import io.platform.base.common.validator.ValidatorUtils;
+
+import io.platform.base.common.annotation.SysLog;
+import io.platform.base.common.utils.ExecuteResult;
+
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/log/configBanner")
+public class ConfigBannerRestController extends AbstractController {
+
+    @Autowired
+	private ConfigBannerServiceRemote configBannerServiceRemote;
+	
+	/**
+	 * 所有列表
+	 */
+	@RequestMapping("/list")
+	@RequiresPermissions("log:configBanner:list")
+	public R list(@RequestParam Map<String, Object> params){
+		//查询列表数据
+		return R.ok().put("list", configBannerServiceRemote.getList(params));
+	}
+
+	/**
+	 * 分页列表
+	 */
+	@RequestMapping("/page")
+	@RequiresPermissions("log:configBanner:page")
+	public R page(Page page,ConfigBannerDto configBannerDto){
+		return R.ok().put("page", configBannerServiceRemote.getPage(page,configBannerDto));
+	}
+	/**
+	 * 信息
+	 */
+	@RequestMapping("/info/{id}")
+	@RequiresPermissions("log:configBanner:info")
+	public R info(@PathVariable("id") Long id){
+		ConfigBannerDto configBannerDto = configBannerServiceRemote.getOne(id);
+		return R.ok().put("configBannerDto", configBannerDto);
+	}
+	
+	/**
+	 * 保存
+	 */
+	@SysLog("保存")
+	@RequestMapping("/save")
+	@RequiresPermissions("log:configBanner:save")
+	public R save(@RequestBody ConfigBannerDto configBannerDto){
+        ValidatorUtils.validateEntity(configBannerDto);
+        ExecuteResult<String> result= configBannerServiceRemote.save(configBannerDto);
+        if(result.isSuccess()){
+            return R.ok(result.getSuccessMessage());
+        }else{
+            return R.error(result.getErrorMessages().get(0));
+        }
+	}
+	
+	/**
+	 * 修改
+	 */
+	@SysLog("修改")
+	@RequestMapping("/update")
+	@RequiresPermissions("log:configBanner:edit")
+	public R update(@RequestBody ConfigBannerDto configBannerDto){
+        ValidatorUtils.validateEntity(configBannerDto);
+        ExecuteResult<String> result= configBannerServiceRemote.update(configBannerDto);
+        if(result.isSuccess()){
+        	return R.ok(result.getSuccessMessage());
+        }else{
+        	return R.error(result.getErrorMessages().get(0));
+        }
+	}
+	
+	/**
+	 * 删除
+	 */
+	@SysLog("删除")
+	@RequestMapping("/delete")
+	@RequiresPermissions("log:configBanner:delete")
+	public R delete(@RequestBody List<Long> ids){
+        ExecuteResult<String> result= configBannerServiceRemote.deleteBatch(ids);
+        if(result.isSuccess()){
+        	return R.ok(result.getSuccessMessage());
+        }else{
+        	return R.error(result.getErrorMessages().get(0));
+        }
+	}
+
+}

sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/controller/rest/ConfigNoticeRestController.java

@@ -0,0 +1,105 @@
+
+package io.platform.homepage.web.controller.rest;
+
+
+import io.platform.homepage.dto.ConfigNoticeDto;
+import io.platform.homepage.web.remote.ConfigNoticeServiceRemote;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.platform.base.common.controller.AbstractController;
+import io.platform.base.common.utils.R;
+import io.platform.base.common.validator.ValidatorUtils;
+
+import io.platform.base.common.annotation.SysLog;
+import io.platform.base.common.utils.ExecuteResult;
+
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/log/configNotice")
+public class ConfigNoticeRestController extends AbstractController {
+
+    @Autowired
+	private ConfigNoticeServiceRemote configNoticeServiceRemote;
+	
+	/**
+	 * 所有列表
+	 */
+	@RequestMapping("/list")
+	@RequiresPermissions("log:configNotice:list")
+	public R list(@RequestParam Map<String, Object> params){
+		//查询列表数据
+		return R.ok().put("list", configNoticeServiceRemote.getList(params));
+	}
+
+	/**
+	 * 分页列表
+	 */
+	@RequestMapping("/page")
+	@RequiresPermissions("log:configNotice:page")
+	public R page(Page page,ConfigNoticeDto configNoticeDto){
+		return R.ok().put("page", configNoticeServiceRemote.getPage(page,configNoticeDto));
+	}
+	/**
+	 * 信息
+	 */
+	@RequestMapping("/info/{id}")
+	@RequiresPermissions("log:configNotice:info")
+	public R info(@PathVariable("id") Long id){
+		ConfigNoticeDto configNoticeDto = configNoticeServiceRemote.getOne(id);
+		return R.ok().put("configNoticeDto", configNoticeDto);
+	}
+	
+	/**
+	 * 保存
+	 */
+	@SysLog("保存")
+	@RequestMapping("/save")
+	@RequiresPermissions("log:configNotice:save")
+	public R save(@RequestBody ConfigNoticeDto configNoticeDto){
+        ValidatorUtils.validateEntity(configNoticeDto);
+        ExecuteResult<String> result= configNoticeServiceRemote.save(configNoticeDto);
+        if(result.isSuccess()){
+            return R.ok(result.getSuccessMessage());
+        }else{
+            return R.error(result.getErrorMessages().get(0));
+        }
+	}
+	
+	/**
+	 * 修改
+	 */
+	@SysLog("修改")
+	@RequestMapping("/update")
+	@RequiresPermissions("log:configNotice:edit")
+	public R update(@RequestBody ConfigNoticeDto configNoticeDto){
+        ValidatorUtils.validateEntity(configNoticeDto);
+        ExecuteResult<String> result= configNoticeServiceRemote.update(configNoticeDto);
+        if(result.isSuccess()){
+        	return R.ok(result.getSuccessMessage());
+        }else{
+        	return R.error(result.getErrorMessages().get(0));
+        }
+	}
+	
+	/**
+	 * 删除
+	 */
+	@SysLog("删除")
+	@RequestMapping("/delete")
+	@RequiresPermissions("log:configNotice:delete")
+	public R delete(@RequestBody List<Long> ids){
+        ExecuteResult<String> result= configNoticeServiceRemote.deleteBatch(ids);
+        if(result.isSuccess()){
+        	return R.ok(result.getSuccessMessage());
+        }else{
+        	return R.error(result.getErrorMessages().get(0));
+        }
+	}
+
+}

sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/remote/ConfigBannerServiceRemote.java

@@ -0,0 +1,63 @@
+
+package io.platform.homepage.web.remote;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.platform.base.common.utils.ExecuteResult;
+import io.platform.homepage.dto.ConfigBannerDto;
+import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Service("configBannerServiceRemote")
+public class ConfigBannerServiceRemote {
+
+    @Reference(check = false)
+    private ConfigBannerServiceClient configBannerServiceClient;
+    /**
+     * 根据参数获取列表  无分页
+     */
+    public List<ConfigBannerDto> getList(Map<String, Object> params){
+        return configBannerServiceClient.queryList(params);
+    }
+    /**
+     * 根据参数进行 分页查询
+     */
+    public Page<ConfigBannerDto> getPage(Page<ConfigBannerDto> page, ConfigBannerDto configBannerDto){
+        return configBannerServiceClient.getPage(page,configBannerDto);
+    }
+    /**
+     * 根据主键 获取单条数据明细
+     */
+    public ConfigBannerDto getOne(Long id){
+        ConfigBannerDto configBannerDto = configBannerServiceClient.queryObject(id);
+        return configBannerDto;
+    }
+    /**
+     * 保存 数据
+     */
+    public ExecuteResult<String> save(ConfigBannerDto configBannerDto){
+
+       return  configBannerServiceClient.save(configBannerDto);
+    }
+    /**
+     * 修改单条数据
+     */
+    public ExecuteResult<String> update(ConfigBannerDto configBannerDto){
+
+        return configBannerServiceClient.update(configBannerDto);
+    }
+    /**
+     * 批量删除
+     */
+    public ExecuteResult<String> deleteBatch(List<Long> ids){
+        return  configBannerServiceClient.deleteBatch(ids);
+    }
+
+
+
+}

sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/remote/ConfigNoticeServiceRemote.java

@@ -0,0 +1,62 @@
+
+package io.platform.homepage.web.remote;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.yhjz.platform.base.common.utils.ExecuteResult;
+
+import io.platform.homepage.dto.ConfigNoticeDto;
+import io.platform.homepage.service.client.api.ConfigNoticeServiceClient;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Service("configNoticeServiceRemote")
+public class ConfigNoticeServiceRemote {
+
+    @Reference(check = false)
+    private ConfigNoticeServiceClient configNoticeServiceClient;
+    /**
+     * 根据参数获取列表  无分页
+     */
+    public List<ConfigNoticeDto> getList(Map<String, Object> params){
+        return configNoticeServiceClient.queryList(params);
+    }
+    /**
+     * 根据参数进行 分页查询
+     */
+    public Page<ConfigNoticeDto> getPage(Page<ConfigNoticeDto> page,ConfigNoticeDto configNoticeDto){
+        return configNoticeServiceClient.getPage(page,configNoticeDto);
+    }
+    /**
+     * 根据主键 获取单条数据明细
+     */
+    public ConfigNoticeDto getOne(Long id){
+        ConfigNoticeDto configNoticeDto = configNoticeServiceClient.queryObject(id);
+        return configNoticeDto;
+    }
+    /**
+     * 保存 数据
+     */
+    public ExecuteResult<String> save(ConfigNoticeDto configNoticeDto){
+
+       return  configNoticeServiceClient.save(configNoticeDto);
+    }
+    /**
+     * 修改单条数据
+     */
+    public ExecuteResult<String> update(ConfigNoticeDto configNoticeDto){
+
+        return configNoticeServiceClient.update(configNoticeDto);
+    }
+    /**
+     * 批量删除
+     */
+    public ExecuteResult<String> deleteBatch(List<Long> ids){
+        return  configNoticeServiceClient.deleteBatch(ids);
+    }
+
+
+
+}

sailun-allsteel-app-rest/src/main/java/io/platform/config/aspect/LogAopAspcet.java

@@ -89,7 +89,7 @@ public class LogAopAspcet {
             Claims claimByToken = jwtUtils.getClaimByToken(token);
             userId = Long.parseLong(claimByToken.getSubject());
         } else {
-            userId = 0L;
+            userId = -1L;
         }
         String ipAddr = IPUtils.getIpAddr(req);
         sysFunctionLogDto.setAccountId(userId);

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/dto/ConfigBannerDto.java

@@ -0,0 +1,72 @@
+package io.platform.homepage.dto;
+
+import lombok.Data;
+
+@Data
+public class ConfigBannerDto  implements java.io.Serializable{
+private static final long serialVersionUID = 5454155825314635342L;
+
+
+/**
+ * mainId       db_column: MAIN_ID
+ */
+private Long mainId;
+/**
+ * banner名称描述       db_column: BANNER_NAME
+ */
+private String bannerName;
+/**
+ * 可见品牌       db_column: BRAND
+ */
+private String brand;
+/**
+ * 链接       db_column: PATH
+ */
+private String path;
+/**
+ * banner图片       db_column: IMG_PATH
+ */
+private String imgPath;
+/**
+ * 类型0静态图片，1活动，2新闻       db_column: TYPE
+ */
+private Long type;
+/**
+ * 排序       db_column: ORDER_INDEX
+ */
+private Long orderIndex;
+/**
+ * 备注       db_column: REMARK
+ */
+private String remark;
+/**
+ * 删除标记 0有效，1删除       db_column: FLAG_DEL
+ */
+private Long flagDel;
+/**
+ * 宽度       db_column: WIDTH
+ */
+private Long width;
+/**
+ * 高度       db_column: HEIGHT
+ */
+private Long height;
+/**
+ * 展示位置0门店       db_column: SHOW_POSITION
+ */
+private Long showPosition;
+/**
+ * 创建时间       db_column: CREATE_TIME
+ */
+private java.util.Date createTime;
+/**
+ * 修改时间       db_column: UPDATE_TIME
+ */
+private java.util.Date updateTime;
+/**
+ * 创建人       db_column: CREATE_BY
+ */
+private String createBy;
+//columns END
+
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/dto/ConfigNoticeDto.java

@@ -0,0 +1,40 @@
+package io.platform.homepage.dto;
+
+import lombok.Data;
+
+@Data
+public class ConfigNoticeDto  implements java.io.Serializable{
+private static final long serialVersionUID = 5454155825314635342L;
+
+
+/**
+ * 主键       db_column: MAIN_ID
+ */
+private Long mainId;
+/**
+ * 消息内容       db_column: MSG_CONTENT
+ */
+private String msgContent;
+/**
+ * 创建时间       db_column: CREATE_TIME
+ */
+private java.util.Date createTime;
+/**
+ * 0系统消息1门店消息2经销商消息3车主消息       db_column: CONTENT_TYPE
+ */
+private Long contentType;
+/**
+ * 创建人ID       db_column: CREATE_USER
+ */
+private Long createUser;
+/**
+ * 标题       db_column: MSG_TITLE
+ */
+private String msgTitle;
+/**
+ * 创建人姓名       db_column: CREATE_USER_NAME
+ */
+private String createUserName;
+//columns END
+
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBannerServiceClient.java

@@ -0,0 +1,45 @@
+
+package io.platform.homepage.service.client.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.homepage.dto.ConfigBannerDto;
+
+import java.util.List;
+import java.util.Map;
+import io.platform.base.common.utils.ExecuteResult;
+
+
+public interface ConfigBannerServiceClient{
+        /**
+         * 根据ID 查询单个对象
+         */
+        ConfigBannerDto queryObject(Long id);
+        /**
+         * 根据参数查询 列表  无分页
+         */
+        List<ConfigBannerDto>queryList(Map<String, Object> map);
+        /**
+         * 根据参数查询 对应参数的 集合大小
+         */
+        int queryTotal(Map<String, Object> map);
+        /**
+         * 保存对象
+         */
+        ExecuteResult<String> save(ConfigBannerDto configBannerDto);
+        /**
+         * 更新对象
+         */
+        ExecuteResult<String> update(ConfigBannerDto configBannerDto);
+        /**
+         * 根据主键 删除对象
+         */
+        ExecuteResult<String> delete(Long id);
+        /**
+         * 根据主键集合 批量删除
+         */
+        ExecuteResult<String> deleteBatch(List<Long> idList);
+        /**
+         * 根据分页参数 获取 分页集合
+         */
+        Page<ConfigBannerDto>getPage(Page<ConfigBannerDto>page,ConfigBannerDto configBannerDto);
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigNoticeServiceClient.java

@@ -0,0 +1,45 @@
+
+package io.platform.homepage.service.client.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.homepage.dto.ConfigNoticeDto;
+
+import java.util.List;
+import java.util.Map;
+import io.platform.base.common.utils.ExecuteResult;
+
+
+public interface ConfigNoticeServiceClient{
+        /**
+         * 根据ID 查询单个对象
+         */
+        ConfigNoticeDto queryObject(Long id);
+        /**
+         * 根据参数查询 列表  无分页
+         */
+        List<ConfigNoticeDto>queryList(Map<String, Object> map);
+        /**
+         * 根据参数查询 对应参数的 集合大小
+         */
+        int queryTotal(Map<String, Object> map);
+        /**
+         * 保存对象
+         */
+        ExecuteResult<String> save(ConfigNoticeDto configNoticeDto);
+        /**
+         * 更新对象
+         */
+        ExecuteResult<String> update(ConfigNoticeDto configNoticeDto);
+        /**
+         * 根据主键 删除对象
+         */
+        ExecuteResult<String> delete(Long id);
+        /**
+         * 根据主键集合 批量删除
+         */
+        ExecuteResult<String> deleteBatch(List<Long> idList);
+        /**
+         * 根据分页参数 获取 分页集合
+         */
+        Page<ConfigNoticeDto>getPage(Page<ConfigNoticeDto>page,ConfigNoticeDto configNoticeDto);
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/log/dto/SysFunctionLogDto.java

@@ -3,7 +3,7 @@ package io.platform.log.dto;
 import lombok.Data;
 
 @Data
-public class SysFunctionLogDto  implements java.io.Serializable{
+public class    SysFunctionLogDto  implements java.io.Serializable{
     private static final long serialVersionUID = 5454155825314635342L;
 
 

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/entity/ConfigBanner.java

@@ -0,0 +1,114 @@
+package io.platform.homepage.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@TableName("APP_CONFIG_BANNER")
+@KeySequence(value="SEQ_BIZ",clazz=Long.class)
+public class ConfigBanner extends Model<ConfigBanner>  implements Serializable{
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * mainId       db_column: MAIN_ID
+     */
+    @TableId(value="MAIN_ID", type= IdType.INPUT)
+    private Long mainId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.mainId;
+    }
+
+    /**
+     * banner名称描述       db_column: BANNER_NAME
+     */
+    @TableField("BANNER_NAME")
+    private String bannerName;
+
+    /**
+     * 可见品牌       db_column: BRAND
+     */
+    @TableField("BRAND")
+    private String brand;
+
+    /**
+     * 链接       db_column: PATH
+     */
+    @TableField("PATH")
+    private String path;
+
+    /**
+     * banner图片       db_column: IMG_PATH
+     */
+    @TableField("IMG_PATH")
+    private String imgPath;
+
+    /**
+     * 类型0静态图片，1活动，2新闻       db_column: TYPE
+     */
+    @TableField("TYPE")
+    private Long type;
+
+    /**
+     * 排序       db_column: ORDER_INDEX
+     */
+    @TableField("ORDER_INDEX")
+    private Long orderIndex;
+
+    /**
+     * 备注       db_column: REMARK
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 删除标记 0有效，1删除       db_column: FLAG_DEL
+     */
+    @TableField("FLAG_DEL")
+    private Long flagDel;
+
+    /**
+     * 宽度       db_column: WIDTH
+     */
+    @TableField("WIDTH")
+    private Long width;
+
+    /**
+     * 高度       db_column: HEIGHT
+     */
+    @TableField("HEIGHT")
+    private Long height;
+
+    /**
+     * 展示位置0门店       db_column: SHOW_POSITION
+     */
+    @TableField("SHOW_POSITION")
+    private Long showPosition;
+
+    /**
+     * 创建时间       db_column: CREATE_TIME
+     */
+    @TableField("CREATE_TIME")
+    private java.util.Date createTime;
+
+    /**
+     * 修改时间       db_column: UPDATE_TIME
+     */
+    @TableField("UPDATE_TIME")
+    private java.util.Date updateTime;
+
+    /**
+     * 创建人       db_column: CREATE_BY
+     */
+    @TableField("CREATE_BY")
+    private String createBy;
+//columns END
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/entity/ConfigNotice.java

@@ -0,0 +1,66 @@
+package io.platform.homepage.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@TableName("APP_CONFIG_NOTICE")
+@KeySequence(value="SEQ_BIZ",clazz=Long.class)
+public class ConfigNotice extends Model<ConfigNotice>  implements Serializable{
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 主键       db_column: MAIN_ID
+     */
+    @TableId(value="MAIN_ID", type= IdType.INPUT)
+    private Long mainId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.mainId;
+    }
+
+    /**
+     * 消息内容       db_column: MSG_CONTENT
+     */
+    @TableField("MSG_CONTENT")
+    private String msgContent;
+
+    /**
+     * 创建时间       db_column: CREATE_TIME
+     */
+    @TableField("CREATE_TIME")
+    private java.util.Date createTime;
+
+    /**
+     * 0系统消息1门店消息2经销商消息3车主消息       db_column: CONTENT_TYPE
+     */
+    @TableField("CONTENT_TYPE")
+    private Long contentType;
+
+    /**
+     * 创建人ID       db_column: CREATE_USER
+     */
+    @TableField("CREATE_USER")
+    private Long createUser;
+
+    /**
+     * 标题       db_column: MSG_TITLE
+     */
+    @TableField("MSG_TITLE")
+    private String msgTitle;
+
+    /**
+     * 创建人姓名       db_column: CREATE_USER_NAME
+     */
+    @TableField("CREATE_USER_NAME")
+    private String createUserName;
+//columns END
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/mapper/ConfigBannerMapper.java

@@ -0,0 +1,14 @@
+package io.platform.homepage.biz.mapper;
+
+import io.platform.base.common.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import io.platform.homepage.biz.entity.ConfigBanner;
+
+
+/**
+ * Created by sevelli on 2017/9/6.
+ */
+@Mapper
+public interface ConfigBannerMapper extends BaseMapper<ConfigBanner>{
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/mapper/ConfigNoticeMapper.java

@@ -0,0 +1,14 @@
+package io.platform.homepage.biz.mapper;
+
+import io.platform.base.common.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import io.platform.homepage.biz.entity.ConfigNotice;
+
+
+/**
+ * Created by sevelli on 2017/9/6.
+ */
+@Mapper
+public interface ConfigNoticeMapper extends BaseMapper<ConfigNotice>{
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/service/ConfigBannerService.java

@@ -0,0 +1,21 @@
+
+package io.platform.homepage.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import io.platform.homepage.biz.mapper.ConfigBannerMapper;
+import io.platform.homepage.biz.entity.ConfigBanner;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("configBannerService")
+public class ConfigBannerService extends ServiceImpl<ConfigBannerMapper,ConfigBanner>{
+
+    public List<ConfigBanner> selectByMap(Map<String, Object> map) {
+        return baseMapper.selectByMap(map);
+    }
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/service/ConfigNoticeService.java

@@ -0,0 +1,21 @@
+
+package io.platform.homepage.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import io.platform.homepage.biz.mapper.ConfigNoticeMapper;
+import io.platform.homepage.biz.entity.ConfigNotice;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("configNoticeService")
+public class ConfigNoticeService extends ServiceImpl<ConfigNoticeMapper,ConfigNotice>{
+
+    public List<ConfigNotice> selectByMap(Map<String, Object> map) {
+        return baseMapper.selectByMap(map);
+    }
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java

@@ -0,0 +1,145 @@
+
+package io.platform.homepage.service.client.impl;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.platform.base.common.BaseServiceClient;
+import io.platform.base.common.utils.ExecuteResult;
+
+import io.platform.homepage.biz.entity.ConfigBanner;
+import io.platform.homepage.biz.service.ConfigBannerService;
+import io.platform.homepage.dto.ConfigBannerDto;
+import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Component
+@Service()
+public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanner,ConfigBannerDto> implements ConfigBannerServiceClient {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private ConfigBannerService configBannerService;
+
+    @Override
+    public ConfigBannerDto queryObject(Long id) {
+        ConfigBanner configBanner = configBannerService.getById(id);
+        ConfigBannerDto configBannerDto = new ConfigBannerDto();
+        BeanUtils.copyProperties(configBanner,configBannerDto);
+        return configBannerDto;
+    }
+
+    @Override
+    public List<ConfigBannerDto> queryList(Map<String, Object> map) {
+        List<ConfigBanner> configBannerList = configBannerService.selectByMap(map);
+        return convertList(configBannerList,ConfigBannerDto.class);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        QueryWrapper<ConfigBanner> ew = new QueryWrapper<>();
+        ew.allEq(map);
+        return configBannerService.selectCount(ew);
+    }
+
+    @Override
+    public ExecuteResult<String> save(ConfigBannerDto configBannerDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            ConfigBanner configBanner = new ConfigBanner();
+            revert(configBannerDto,configBanner);
+            boolean flag = configBannerService.save(configBanner);
+            if(!flag){
+                result.addErrorMessage("保存失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 保存错误：" + e.toString(), e);
+            result.addErrorMessage("保存错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> update(ConfigBannerDto configBannerDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            ConfigBanner configBanner = new ConfigBanner();
+            revert(configBannerDto,configBanner);
+            boolean flag = configBannerService.updateById(configBanner);
+            if(!flag){
+                result.addErrorMessage("更新失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 更新错误：" + e.toString(), e);
+            result.addErrorMessage("更新错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> delete(Long id) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = configBannerService.removeById(id);
+            if(!flag){
+                result.addErrorMessage("删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> deleteBatch(List<Long> ids) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = configBannerService.removeByIds(ids);
+            if(!flag){
+                result.addErrorMessage("批量删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public Page<ConfigBannerDto> getPage(Page<ConfigBannerDto> pageDto,ConfigBannerDto configBannerDto) {
+        Page<ConfigBanner> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
+
+        page.setAsc(pageDto.ascs());
+        page.setDesc(pageDto.descs());
+        page.condition().putAll(pageDto.condition());
+
+        ConfigBanner configBanner = new ConfigBanner();
+        revert(configBannerDto,configBanner);
+
+        QueryWrapper<ConfigBanner> wrapper = new QueryWrapper<>();
+        wrapper.setEntity(configBanner);
+
+        List<ConfigBannerDto> configBannerDtoList = convertList(configBannerService.page(page,wrapper).getRecords(),ConfigBannerDto.class);
+        pageDto.setTotal(configBannerService.count(wrapper));
+        pageDto.setRecords(configBannerDtoList);
+        return pageDto;
+    }
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigNoticeServiceClientImpl.java

@@ -0,0 +1,145 @@
+
+package io.platform.homepage.service.client.impl;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.platform.base.common.BaseServiceClient;
+import io.platform.base.common.utils.ExecuteResult;
+
+import io.platform.homepage.biz.entity.ConfigNotice;
+import io.platform.homepage.biz.service.ConfigNoticeService;
+import io.platform.homepage.dto.ConfigNoticeDto;
+import io.platform.homepage.service.client.api.ConfigNoticeServiceClient;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Component
+@Service()
+public class ConfigNoticeServiceClientImpl extends BaseServiceClient<ConfigNotice,ConfigNoticeDto> implements ConfigNoticeServiceClient {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private ConfigNoticeService configNoticeService;
+
+    @Override
+    public ConfigNoticeDto queryObject(Long id) {
+        ConfigNotice configNotice = configNoticeService.getById(id);
+        ConfigNoticeDto configNoticeDto = new ConfigNoticeDto();
+        BeanUtils.copyProperties(configNotice,configNoticeDto);
+        return configNoticeDto;
+    }
+
+    @Override
+    public List<ConfigNoticeDto> queryList(Map<String, Object> map) {
+        List<ConfigNotice> configNoticeList = configNoticeService.selectByMap(map);
+        return convertList(configNoticeList,ConfigNoticeDto.class);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        QueryWrapper<ConfigNotice> ew = new QueryWrapper<>();
+        ew.allEq(map);
+        return configNoticeService.selectCount(ew);
+    }
+
+    @Override
+    public ExecuteResult<String> save(ConfigNoticeDto configNoticeDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            ConfigNotice configNotice = new ConfigNotice();
+            revert(configNoticeDto,configNotice);
+            boolean flag = configNoticeService.save(configNotice);
+            if(!flag){
+                result.addErrorMessage("保存失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 保存错误：" + e.toString(), e);
+            result.addErrorMessage("保存错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> update(ConfigNoticeDto configNoticeDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            ConfigNotice configNotice = new ConfigNotice();
+            revert(configNoticeDto,configNotice);
+            boolean flag = configNoticeService.updateById(configNotice);
+            if(!flag){
+                result.addErrorMessage("更新失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 更新错误：" + e.toString(), e);
+            result.addErrorMessage("更新错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> delete(Long id) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = configNoticeService.removeById(id);
+            if(!flag){
+                result.addErrorMessage("删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> deleteBatch(List<Long> ids) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = configNoticeService.removeByIds(ids);
+            if(!flag){
+                result.addErrorMessage("批量删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public Page<ConfigNoticeDto> getPage(Page<ConfigNoticeDto> pageDto,ConfigNoticeDto configNoticeDto) {
+        Page<ConfigNotice> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
+
+        page.setAsc(pageDto.ascs());
+        page.setDesc(pageDto.descs());
+        page.condition().putAll(pageDto.condition());
+
+        ConfigNotice configNotice = new ConfigNotice();
+        revert(configNoticeDto,configNotice);
+
+        QueryWrapper<ConfigNotice> wrapper = new QueryWrapper<>();
+        wrapper.setEntity(configNotice);
+
+        List<ConfigNoticeDto> configNoticeDtoList = convertList(configNoticeService.page(page,wrapper).getRecords(),ConfigNoticeDto.class);
+        pageDto.setTotal(configNoticeService.count(wrapper));
+        pageDto.setRecords(configNoticeDtoList);
+        return pageDto;
+    }
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/log/biz/entity/SysFunctionLog.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 @Data
 @TableName("SYS_FUNCTION_LOG")
-@KeySequence(value="SEQ_BUS",clazz=Long.class)
+@KeySequence(value="SEQ_LOG",clazz=Long.class)
 public class SysFunctionLog extends Model<SysFunctionLog>  implements Serializable{
 
     private static final long serialVersionUID = 5454155825314635342L;

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/log/service/client/impl/SysFunctionLogServiceClientImpl.java

@@ -129,7 +129,12 @@ public class SysFunctionLogServiceClientImpl extends BaseServiceClient<SysFuncti
 
         page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        if (page.condition()!=null){
+            page.condition().putAll(pageDto.condition());
+        }
+        if ("".equals(sysFunctionLogDto.getFunctionName())) {
+            sysFunctionLogDto.setFunctionName(null);
+        }
 
         SysFunctionLog sysFunctionLog = new SysFunctionLog();
         revert(sysFunctionLogDto,sysFunctionLog);

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/hompage/ConfigBannerMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="io.platform.homepage.biz.mapper.ConfigBannerMapper">
+
+
+
+</mapper>

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/hompage/ConfigNoticeMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="io.platform.homepage.biz.mapper.ConfigNoticeMapper">
+
+
+
+</mapper>

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ spring:
     password: "redis@sailun"
     port: 6479
     connection-time-out: 20000
-    database: 15
+    database: 0
 
     jedis:
       pool: