新增aop切面，添加日志记录控制@FuncLogAnno

README.md

@@ -27,3 +27,8 @@ location /api/sys/{
     proxy_pass http://127.0.0.1:8403/;
 }
 
+
+# 接口规范
+1.app接口为方便前端测试查看，统一添加Swagger注解，注解信息存在SailunAppSwaggerController类中。前端访问 http://localhost:8503/swagger-ui.html
+2.@Login登录token校验
+3.日志记录，在需要记录日志操作的方法上添加@FuncLogAnno(functionName = "接口功能描述")

sailun-allsteel-admin-rest/pom.xml

@@ -166,6 +166,12 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
+        <dependency>
+            <groupId>io.platform.sailun.allsteel</groupId>
+            <artifactId>saillun-allsteel-bus-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

sailun-allsteel-admin-rest/src/main/java/io/platform/log/web/controller/rest/SysFunctionLogRestController.java

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

@@ -0,0 +1,64 @@
+
+package io.platform.log.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.log.dto.SysFunctionLogDto;
+import io.platform.log.service.client.api.SysFunctionLogServiceClient;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Service("sysFunctionLogServiceRemote")
+public class SysFunctionLogServiceRemote {
+
+    @Reference(check = false)
+    private SysFunctionLogServiceClient sysFunctionLogServiceClient;
+    /**
+     * 根据参数获取列表  无分页
+     */
+    public List<SysFunctionLogDto> getList(Map<String, Object> params){
+        return sysFunctionLogServiceClient.queryList(params);
+    }
+    /**
+     * 根据参数进行 分页查询
+     */
+    public Page<SysFunctionLogDto> getPage(Page<SysFunctionLogDto> page, SysFunctionLogDto sysFunctionLogDto){
+        return sysFunctionLogServiceClient.getPage(page,sysFunctionLogDto);
+    }
+    /**
+     * 根据主键 获取单条数据明细
+     */
+    public SysFunctionLogDto getOne(Long id){
+        SysFunctionLogDto sysFunctionLogDto = sysFunctionLogServiceClient.queryObject(id);
+        return sysFunctionLogDto;
+    }
+    /**
+     * 保存 数据
+     */
+    public ExecuteResult<String> save(SysFunctionLogDto sysFunctionLogDto){
+
+       return  sysFunctionLogServiceClient.save(sysFunctionLogDto);
+    }
+    /**
+     * 修改单条数据
+     */
+    public ExecuteResult<String> update(SysFunctionLogDto sysFunctionLogDto){
+
+        return sysFunctionLogServiceClient.update(sysFunctionLogDto);
+    }
+    /**
+     * 批量删除
+     */
+    public ExecuteResult<String> deleteBatch(List<Long> ids){
+        return  sysFunctionLogServiceClient.deleteBatch(ids);
+    }
+
+
+
+}

sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/controller/rest/SysMessageRestController.java

@@ -1,107 +0,0 @@
-
-package io.platform.sys.web.controller.rest;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.platform.base.common.annotation.SysLog;
-import io.platform.base.common.controller.AbstractController;
-import io.platform.base.common.utils.ExecuteResult;
-import io.platform.base.common.utils.R;
-import io.platform.base.common.validator.ValidatorUtils;
-import io.platform.sys.dto.SysMessageDto;
-import io.platform.sys.web.remote.SysMessageServiceRemote;
-import org.springframework.web.bind.annotation.*;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-import java.util.List;
-import java.util.Map;
-
-
-@RestController
-@RequestMapping("/sys/sysMessage")
-public class SysMessageRestController extends AbstractController {
-
-    @Autowired
-	private SysMessageServiceRemote sysMessageServiceRemote;
-	
-	/**
-	 * 所有列表
-	 */
-	@RequestMapping("/list")
-	@RequiresPermissions("sys:sysMessage:list")
-	public R list(@RequestParam Map<String, Object> params){
-		//查询列表数据
-		return R.ok().put("list", sysMessageServiceRemote.getList(params));
-	}
-
-	/**
-	 * 分页列表
-	 */
-	@RequestMapping("/page")
-	@RequiresPermissions("sys:sysMessage:page")
-	public R page(Page page, SysMessageDto sysMessageDto){
-		return R.ok().put("page", sysMessageServiceRemote.getPage(page,sysMessageDto));
-	}
-	/**
-	 * 信息
-	 */
-	@RequestMapping("/info/{id}")
-	@RequiresPermissions("sys:sysMessage:info")
-	public R info(@PathVariable("id") Long id){
-		SysMessageDto sysMessageDto = sysMessageServiceRemote.getOne(id);
-		return R.ok().put("sysMessageDto", sysMessageDto);
-	}
-	
-	/**
-	 * 保存
-	 */
-	@SysLog("保存")
-	@RequestMapping("/save")
-	@RequiresPermissions("sys:sysMessage:save")
-	public R save(@RequestBody SysMessageDto sysMessageDto){
-		String username = getUser().getUsername();
-		Long userId = getUserId();
-		ValidatorUtils.validateEntity(sysMessageDto);
-        ExecuteResult<String> result= sysMessageServiceRemote.save(sysMessageDto,username,userId);
-        if(result.isSuccess()){
-            return R.ok(result.getSuccessMessage());
-        }else{
-            return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 修改
-	 */
-	@SysLog("修改")
-	@RequestMapping("/update")
-	@RequiresPermissions("sys:sysMessage:edit")
-	public R update(@RequestBody SysMessageDto sysMessageDto){
-        ValidatorUtils.validateEntity(sysMessageDto);
-        ExecuteResult<String> result= sysMessageServiceRemote.update(sysMessageDto);
-        if(result.isSuccess()){
-        return R.ok(result.getSuccessMessage());
-        }else{
-        return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 删除
-	 */
-	@SysLog("删除")
-	@RequestMapping("/delete")
-	@RequiresPermissions("sys:sysMessage:delete")
-	public R delete(@RequestBody List<Long> ids){
-        ExecuteResult<String> result= sysMessageServiceRemote.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/sys/web/controller/rest/SysMetaCityRestController.java

@@ -1,108 +0,0 @@
-package io.platform.sys.web.controller.rest;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import io.platform.base.common.annotation.SysLog;
-import io.platform.base.common.controller.AbstractController;
-import io.platform.base.common.utils.ExecuteResult;
-import io.platform.base.common.utils.R;
-import io.platform.base.common.validator.ValidatorUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.platform.sys.dto.SysMetaCityDto;
-import io.platform.sys.web.remote.SysMetaCityServiceRemote;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/sys/sysMetaCity")
-public class SysMetaCityRestController extends AbstractController {
-
-    @Autowired
-	private SysMetaCityServiceRemote sysMetaCityServiceRemote;
-	
-	/**
-	 * 所有列表
-	 */
-	@RequestMapping("/list")
-	@RequiresPermissions("sys:sysMetaCity:list")
-	public R list(@RequestBody String s){
-		Map<String,Object> params= (Map) JSON.parse(s);
-		if (params.get("t") != null || !"".equals(params.get("t"))) {
-			params.remove("t");
-		}
-		//查询列表数据
-		return R.ok().put("list", sysMetaCityServiceRemote.getList(params));
-	}
-
-	/**
-	 * 分页列表
-	 */
-	@RequestMapping("/page")
-	@RequiresPermissions("sys:sysMetaCity:page")
-	public R page(Page<SysMetaCityDto> page,SysMetaCityDto sysMetaCityDto){
-		return R.ok().put("page", sysMetaCityServiceRemote.getPage(page,sysMetaCityDto));
-	}
-	/**
-	 * 信息
-	 */
-	@RequestMapping("/info/{id}")
-	@RequiresPermissions("sys:sysMetaCity:info")
-	public R info(@PathVariable("id") Long id){
-		SysMetaCityDto sysMetaCityDto = sysMetaCityServiceRemote.getOne(id);
-		return R.ok().put("sysMetaCityDto", sysMetaCityDto);
-	}
-	
-	/**
-	 * 保存
-	 */
-	@SysLog("保存")
-	@RequestMapping("/save")
-	@RequiresPermissions("sys:sysMetaCity:save")
-	public R save(@RequestBody SysMetaCityDto sysMetaCityDto){
-        ValidatorUtils.validateEntity(sysMetaCityDto);
-        ExecuteResult<String> result= sysMetaCityServiceRemote.save(sysMetaCityDto);
-        if(result.isSuccess()){
-            return R.ok(result.getSuccessMessage());
-        }else{
-            return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 修改
-	 */
-	@SysLog("修改")
-	@RequestMapping("/update")
-	@RequiresPermissions("sys:sysMetaCity:edit")
-	public R update(@RequestBody SysMetaCityDto sysMetaCityDto){
-        ValidatorUtils.validateEntity(sysMetaCityDto);
-        ExecuteResult<String> result= sysMetaCityServiceRemote.update(sysMetaCityDto);
-        if(result.isSuccess()){
-        return R.ok(result.getSuccessMessage());
-        }else{
-        return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 删除
-	 */
-	@SysLog("删除")
-	@RequestMapping("/delete")
-	@RequiresPermissions("sys:sysMetaCity:delete")
-	public R delete(@RequestBody List<Long> ids){
-        ExecuteResult<String> result= sysMetaCityServiceRemote.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/sys/web/controller/rest/SysMetaProvinceRestController.java

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

sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/controller/rest/TbUserRestController.java

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

@@ -1,64 +0,0 @@
-
-package io.platform.sys.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.sys.dto.SysMessageDto;
-import io.platform.sys.service.client.api.SysMessageServiceClient;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Service("sysMessageServiceRemote")
-public class SysMessageServiceRemote {
-
-    @Reference(check = false)
-    private SysMessageServiceClient sysMessageServiceClient;
-    /**
-     * 根据参数获取列表  无分页
-     */
-    public List<SysMessageDto> getList(Map<String, Object> params){
-        return sysMessageServiceClient.queryList(params);
-    }
-    /**
-     * 根据参数进行 分页查询
-     */
-    public Page<SysMessageDto> getPage(Page<SysMessageDto> page, SysMessageDto sysMessageDto){
-        return sysMessageServiceClient.getPage(page,sysMessageDto);
-    }
-    /**
-     * 根据主键 获取单条数据明细
-     */
-    public SysMessageDto getOne(Long id){
-        SysMessageDto sysMessageDto = sysMessageServiceClient.queryObject(id);
-        return sysMessageDto;
-    }
-    /**
-     * 保存 数据
-     */
-    public ExecuteResult<String> save(SysMessageDto sysMessageDto, String username, Long userId){
-
-       return  sysMessageServiceClient.save(sysMessageDto,username,userId);
-    }
-    /**
-     * 修改单条数据
-     */
-    public ExecuteResult<String> update(SysMessageDto sysMessageDto){
-
-        return sysMessageServiceClient.update(sysMessageDto);
-    }
-    /**
-     * 批量删除
-     */
-    public ExecuteResult<String> deleteBatch(List<Long> ids){
-        return  sysMessageServiceClient.deleteBatch(ids);
-    }
-
-
-
-}

sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/remote/SysMetaCityServiceRemote.java

@@ -1,68 +0,0 @@
-
-package io.platform.sys.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.sys.dto.SysMetaCityDto;
-import io.platform.sys.service.client.api.SysMetaCityServiceClient;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Service("sysMetaCityServiceRemote")
-public class SysMetaCityServiceRemote {
-
-    @Reference(check = false)
-    private SysMetaCityServiceClient sysMetaCityServiceClient;
-    /**
-     * 根据参数获取列表  无分页
-     */
-    public List<SysMetaCityDto> getList(Map<String, Object> params){
-        return sysMetaCityServiceClient.queryList(params);
-    }
-    /**
-     * 根据参数进行 分页查询
-     */
-    public Page<SysMetaCityDto> getPage(Page<SysMetaCityDto> page,SysMetaCityDto sysMetaCityDto){
-        return sysMetaCityServiceClient.getPage(page,sysMetaCityDto);
-    }
-    /**
-     * 根据主键 获取单条数据明细
-     */
-    public SysMetaCityDto getOne(Long id){
-        SysMetaCityDto sysMetaCityDto = sysMetaCityServiceClient.queryObject(id);
-        return sysMetaCityDto;
-    }
-    /**
-     * 保存 数据
-     */
-    public ExecuteResult<String> save(SysMetaCityDto sysMetaCityDto){
-
-       return  sysMetaCityServiceClient.save(sysMetaCityDto);
-    }
-    /**
-     * 修改单条数据
-     */
-    public ExecuteResult<String> update(SysMetaCityDto sysMetaCityDto){
-
-        return sysMetaCityServiceClient.update(sysMetaCityDto);
-    }
-    /**
-     * 批量删除
-     */
-    public ExecuteResult<String> deleteBatch(List<Long> ids){
-        return  sysMetaCityServiceClient.deleteBatch(ids);
-    }
-
-
-
-}

sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/remote/SysMetaProvinceServiceRemote.java

@@ -1,70 +0,0 @@
-
-package io.platform.sys.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.sys.dto.SysMetaProvinceDto;
-import io.platform.sys.service.client.api.SysMetaProvinceServiceClient;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Service("sysMetaProvinceServiceRemote")
-public class SysMetaProvinceServiceRemote {
-
-    @Reference(check = false)
-    private SysMetaProvinceServiceClient sysMetaProvinceServiceClient;
-    /**
-     * 根据参数获取列表  无分页
-     */
-    public List<SysMetaProvinceDto> getList(Map<String, Object> params){
-        return sysMetaProvinceServiceClient.queryList(params);
-    }
-    /**
-     * 根据参数进行 分页查询
-     */
-    public Page<SysMetaProvinceDto> getPage(Page<SysMetaProvinceDto> page,SysMetaProvinceDto sysMetaProvinceDto){
-        return sysMetaProvinceServiceClient.getPage(page,sysMetaProvinceDto);
-    }
-    /**
-     * 根据主键 获取单条数据明细
-     */
-    public SysMetaProvinceDto getOne(Long id){
-        SysMetaProvinceDto sysMetaProvinceDto = sysMetaProvinceServiceClient.queryObject(id);
-        return sysMetaProvinceDto;
-    }
-    /**
-     * 保存 数据
-     */
-    public ExecuteResult<String> save(SysMetaProvinceDto sysMetaProvinceDto){
-
-       return  sysMetaProvinceServiceClient.save(sysMetaProvinceDto);
-    }
-    /**
-     * 修改单条数据
-     */
-    public ExecuteResult<String> update(SysMetaProvinceDto sysMetaProvinceDto){
-
-        return sysMetaProvinceServiceClient.update(sysMetaProvinceDto);
-    }
-    /**
-     * 批量删除
-     */
-    public ExecuteResult<String> deleteBatch(List<Long> ids){
-        return  sysMetaProvinceServiceClient.deleteBatch(ids);
-    }
-
-
-    public  Object getProvinceAndCity() {
-        return this.sysMetaProvinceServiceClient.getProvinceAndCity();
-    }
-}

sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/remote/TbUserServiceRemote.java

@@ -1,71 +0,0 @@
-
-package io.platform.sys.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.sys.dto.TbUserDto;
-import io.platform.sys.service.client.api.TbUserServiceClient;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Service("tbUserServiceRemote")
-public class TbUserServiceRemote {
-
-    @Reference(check = false)
-    private TbUserServiceClient tbUserServiceClient;
-
-    /**
-     * 根据参数获取列表  无分页
-     */
-    public List<TbUserDto> getList(Map<String, Object> params) {
-
-        return tbUserServiceClient.queryList(params);
-    }
-
-    /**
-     * 根据参数进行 分页查询
-     */
-    public Page<TbUserDto> getPage(Page<TbUserDto> page, TbUserDto tbUserDto) {
-        return tbUserServiceClient.getPage(page, tbUserDto);
-    }
-
-    /**
-     * 根据主键 获取单条数据明细
-     */
-    public TbUserDto getOne(Long id) {
-        TbUserDto tbUserDto = tbUserServiceClient.queryObject(id);
-        return tbUserDto;
-    }
-
-    /**
-     * 保存 数据
-     */
-    public ExecuteResult<String> save(TbUserDto tbUserDto) {
-
-        return tbUserServiceClient.save(tbUserDto);
-    }
-
-    /**
-     * 修改单条数据
-     */
-    public ExecuteResult<String> update(TbUserDto tbUserDto) {
-
-        return tbUserServiceClient.update(tbUserDto);
-    }
-
-    /**
-     * 批量删除
-     */
-    public ExecuteResult<String> deleteBatch(List<Long> ids) {
-        return tbUserServiceClient.deleteBatch(ids);
-    }
-
-
-}

sailun-allsteel-app-rest/pom.xml

@@ -28,6 +28,11 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>io.platform.sailun.allsteel</groupId>
+            <artifactId>saillun-allsteel-bus-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/SailunAppSwaggerController.java

@@ -0,0 +1,43 @@
+package io.platform.app.web.controller;
+
+
+import io.platform.config.annotation.FuncLogAnno;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "Swagger测试类相关接口")
+@RestController
+public class SailunAppSwaggerController {
+
+
+    /**
+     *   @ApiOperation 表明接口的作用
+     *   @ApiImplicitParams 表明接口所需的参数列表(非表单提交)
+     *      @ApiImplicitParam  参数值
+     *
+     *
+     *   表单提交  需要在实体类上添加注解
+     *   @ApiModel  告知swagger实体
+     *   @ApiModelProperty(value = "用户id")
+     *   @ApiModelProperty(value = "用户地址")
+     *
+     *
+     * @return
+     */
+    @GetMapping("/hello")
+    @ApiOperation("测试的接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "username", value = "用户名", defaultValue = "李四"),
+            @ApiImplicitParam(name = "address", value = "用户地址", defaultValue = "深圳", required = true)
+    })
+    @FuncLogAnno(functionName = "测试日志操作")
+    public String addUser() {
+        return "hello";
+    }
+
+
+}

sailun-allsteel-app-rest/src/main/java/io/platform/base/common/utils/JwtUtils.java

@@ -1,8 +1,13 @@
 package io.platform.base.common.utils;
 
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.DecodedJWT;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import io.platform.base.common.exception.RRException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -42,18 +47,27 @@ public class JwtUtils {
                 .compact();
     }
 
-    public Claims getClaimByToken(String token) {
-        try {
-            return Jwts.parser()
-                    .setSigningKey(secret)
-                    .parseClaimsJws(token)
-                    .getBody();
-        }catch (Exception e){
-            logger.debug("validate is token error ", e);
-            return null;
-        }
+    public Claims getClaimByToken(String token) throws RRException{
+        return Jwts.parser()
+                .setSigningKey(secret)
+                .parseClaimsJws(token)
+                .getBody();
     }
 
+
+    /**
+     * 根据token 获取id
+     * @param token
+     * @return
+     */
+    public Long getUserId(String token) {
+        JWTVerifier require = JWT.require(Algorithm.HMAC256(secret)).build();
+        DecodedJWT verify = require.verify(token);
+        Long userID = verify.getClaim("userId").asLong();
+        return userID;
+    }
+
+
     /**
      * token是否过期
      * @return  true：过期

sailun-allsteel-app-rest/src/main/java/io/platform/config/annotation/FuncLogAnno.java

@@ -0,0 +1,24 @@
+package io.platform.config.annotation;
+
+
+import org.springframework.core.annotation.Order;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+
+/**
+ * 日志注解
+ * @author shanxin
+ */
+@Target(ElementType.METHOD) // 方法注解
+@Retention(RetentionPolicy.RUNTIME) // 运行时可见
+public @interface FuncLogAnno {
+
+    String functionName(); // 功能名称
+
+
+}

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

@@ -0,0 +1,116 @@
+package io.platform.config.aspect;
+
+
+import java.lang.reflect.Method;
+import java.sql.SQLException;
+import java.util.Date;
+
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.alibaba.fastjson.JSON;
+import io.jsonwebtoken.Claims;
+import io.platform.base.common.utils.IPUtils;
+import io.platform.base.common.utils.JwtUtils;
+import io.platform.config.annotation.FuncLogAnno;
+import io.platform.log.dto.SysFunctionLogDto;
+import io.platform.log.service.client.api.SysFunctionLogServiceClient;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * TODO
+ *
+ * Sopring Aop 实现日志记录
+ *
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/10/29 13:36
+ */
+@Order(3)
+@Component
+@Aspect
+public class LogAopAspcet {
+
+
+    private Logger log = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    public JwtUtils jwtUtils;
+
+
+    @Reference
+    public SysFunctionLogServiceClient sysFunctionLogServiceClient;
+
+
+    /**
+     *
+     * 环绕通知记录日志通过注解匹配到需要增加日志功能的方法
+     * @param pjp
+     * @return
+     * @throws Throwable
+     */
+    @Around("@annotation(io.platform.config.annotation.FuncLogAnno)")
+    public Object aroundAdvice(ProceedingJoinPoint pjp) throws Throwable {
+        // 1.方法执行前的处理，相当于前置通知
+        // 获取方法签名
+        MethodSignature methodSignature = (MethodSignature) pjp.getSignature();
+        // 获取方法
+        Method method = methodSignature.getMethod();
+        // 获取方法上面的注解
+        FuncLogAnno logAnno = method.getAnnotation(FuncLogAnno.class);
+        // 获取注解上的功能描述
+        String operateType = logAnno.functionName();
+
+        Object result = null;
+
+
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest req = attributes.getRequest();
+
+        // 日志对象
+        SysFunctionLogDto sysFunctionLogDto = new SysFunctionLogDto();
+        sysFunctionLogDto.setFunctionName(operateType);
+        Long userId = null;
+        String token = req.getParameter(jwtUtils.getHeader());
+        if (null != token) {
+            Claims claimByToken = jwtUtils.getClaimByToken(token);
+            userId = Long.parseLong(claimByToken.getSubject());
+        } else {
+            userId = 0L;
+        }
+        String ipAddr = IPUtils.getIpAddr(req);
+        sysFunctionLogDto.setAccountId(userId);
+        sysFunctionLogDto.setIpAddress(ipAddr);
+        //请求的参数
+        Object[] args = pjp.getArgs();
+        //将参数所在的数组转换成json
+        String params = JSON.toJSONString(args);
+        sysFunctionLogDto.setParamsJson(params);
+        sysFunctionLogDto.setCreateTime(new Date());
+        try {
+            // 让代理方法执行
+            result = pjp.proceed();
+            // 2.相当于后置通知(方法成功执行之后走这里)
+        } catch (SQLException e) {
+            // 3.相当于异常通知部分
+        } finally {
+            // 4.相当于最终通知
+            sysFunctionLogServiceClient.save(sysFunctionLogDto);
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package io.platform.log.dto;
+
+import lombok.Data;
+
+@Data
+public class SysFunctionLogDto  implements java.io.Serializable{
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 主键id       db_column: MAIN_ID
+     */
+    private Long mainId;
+    /**
+     * 账号id       db_column: ACCOUNT_ID
+     */
+    private Long accountId;
+    /**
+     * 功能名称       db_column: FUNCTION_NAME
+     */
+    private String functionName;
+    /**
+     * IP地址       db_column: IP_ADDRESS
+     */
+    private String ipAddress;
+
+    /**
+     * 请求参数JSON       db_column: CREATE_TIME
+     */
+    private String paramsJson;
+
+
+    /**
+     * 调用时间       db_column: CREATE_TIME
+     */
+    private java.util.Date createTime;
+
+
+}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/SysMetaCityServiceClient.java → sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/log/service/client/api/SysFunctionLogServiceClient.java

@@ -1,25 +1,23 @@
 
-package io.platform.sys.service.client.api;
+package io.platform.log.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.platform.sys.dto.SysMetaCityDto;
+import io.platform.log.dto.SysFunctionLogDto;
 
 import java.util.List;
 import java.util.Map;
 import io.platform.base.common.utils.ExecuteResult;
 
-/**
- * Created by sevelli on 2017/8/31.
- */
-public interface SysMetaCityServiceClient{
+
+public interface SysFunctionLogServiceClient{
         /**
          * 根据ID 查询单个对象
          */
-        SysMetaCityDto queryObject(Long id);
+        SysFunctionLogDto queryObject(Long id);
         /**
          * 根据参数查询 列表  无分页
          */
-        List<SysMetaCityDto>queryList(Map<String, Object> map);
+        List<SysFunctionLogDto>queryList(Map<String, Object> map);
         /**
          * 根据参数查询 对应参数的 集合大小
          */
@@ -27,11 +25,11 @@ public interface SysMetaCityServiceClient{
         /**
          * 保存对象
          */
-        ExecuteResult<String> save(SysMetaCityDto sysMetaCityDto);
+        ExecuteResult<String> save(SysFunctionLogDto sysFunctionLogDto);
         /**
          * 更新对象
          */
-        ExecuteResult<String> update(SysMetaCityDto sysMetaCityDto);
+        ExecuteResult<String> update(SysFunctionLogDto sysFunctionLogDto);
         /**
          * 根据主键 删除对象
          */
@@ -43,5 +41,5 @@ public interface SysMetaCityServiceClient{
         /**
          * 根据分页参数 获取 分页集合
          */
-        Page<SysMetaCityDto>getPage(Page<SysMetaCityDto>page,SysMetaCityDto sysMetaCityDto);
+        Page<SysFunctionLogDto>getPage(Page<SysFunctionLogDto>page,SysFunctionLogDto sysFunctionLogDto);
 }

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

@@ -0,0 +1,61 @@
+package io.platform.log.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@TableName("SYS_FUNCTION_LOG")
+@KeySequence(value="SEQ_BUS",clazz=Long.class)
+public class SysFunctionLog extends Model<SysFunctionLog>  implements Serializable{
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 主键id       db_column: MAIN_ID
+     */
+    @TableId(value="MAIN_ID", type= IdType.INPUT)
+    private Long mainId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.mainId;
+    }
+
+    /**
+     * 账号id       db_column: ACCOUNT_ID
+     */
+    @TableField("ACCOUNT_ID")
+    private Long accountId;
+
+    /**
+     * 功能名称       db_column: FUNCTION_NAME
+     */
+    @TableField("FUNCTION_NAME")
+    private String functionName;
+
+    /**
+     * IP地址       db_column: IP_ADDRESS
+     */
+    @TableField("IP_ADDRESS")
+    private String ipAddress;
+
+
+    /**
+     * 请求参数       db_column: PARAMS_JSON
+     */
+    @TableField("PARAMS_JSON")
+    private String paramsJson;
+
+    /**
+     * 调用时间       db_column: CREATE_TIME
+     */
+    @TableField("CREATE_TIME")
+    private java.util.Date createTime;
+//columns END
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/log/biz/mapper/SysFunctionLogMapper.java

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

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

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

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

@@ -1,5 +1,5 @@
 
-package io.platform.sys.service.client.impl;
+package io.platform.log.service.client.impl;
 
 import com.alibaba.dubbo.config.annotation.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
-import io.platform.sys.biz.entity.SysMetaCity;
-import io.platform.sys.biz.service.SysMetaCityService;
-import io.platform.sys.dto.SysMetaCityDto;
-import io.platform.sys.service.client.api.SysMetaCityServiceClient;
+import io.platform.log.biz.entity.SysFunctionLog;
+import io.platform.log.biz.service.SysFunctionLogService;
+import io.platform.log.dto.SysFunctionLogDto;
+import io.platform.log.service.client.api.SysFunctionLogServiceClient;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,44 +24,44 @@ import java.util.List;
 import java.util.Map;
 
 
-/**
- * Created by sevelli on 2017/8/31.
- */
+
 @Component
 @Service()
-public class SysMetaCityServiceClientImpl extends BaseServiceClient<SysMetaCity,SysMetaCityDto> implements SysMetaCityServiceClient {
+public class SysFunctionLogServiceClientImpl extends BaseServiceClient<SysFunctionLog,SysFunctionLogDto> implements SysFunctionLogServiceClient {
+
     private Logger logger = LoggerFactory.getLogger(getClass());
+
     @Resource
-    private SysMetaCityService sysMetaCityService;
+    private SysFunctionLogService sysFunctionLogService;
 
     @Override
-    public SysMetaCityDto queryObject(Long id) {
-        SysMetaCity sysMetaCity = sysMetaCityService.getById(id);
-        SysMetaCityDto sysMetaCityDto = new SysMetaCityDto();
-        BeanUtils.copyProperties(sysMetaCity,sysMetaCityDto);
-        return sysMetaCityDto;
+    public SysFunctionLogDto queryObject(Long id) {
+        SysFunctionLog sysFunctionLog = sysFunctionLogService.getById(id);
+        SysFunctionLogDto sysFunctionLogDto = new SysFunctionLogDto();
+        BeanUtils.copyProperties(sysFunctionLog,sysFunctionLogDto);
+        return sysFunctionLogDto;
     }
 
     @Override
-    public List<SysMetaCityDto> queryList(Map<String, Object> map) {
-        List<SysMetaCity> sysMetaCityList = sysMetaCityService.selectByMap(map);
-        return convertList(sysMetaCityList,SysMetaCityDto.class);
+    public List<SysFunctionLogDto> queryList(Map<String, Object> map) {
+        List<SysFunctionLog> sysFunctionLogList = sysFunctionLogService.selectByMap(map);
+        return convertList(sysFunctionLogList,SysFunctionLogDto.class);
     }
 
     @Override
     public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<SysMetaCity> ew = new QueryWrapper<>();
+        QueryWrapper<SysFunctionLog> ew = new QueryWrapper<>();
         ew.allEq(map);
-        return sysMetaCityService.count(ew);
+        return sysFunctionLogService.count(ew);
     }
 
     @Override
-    public ExecuteResult<String> save(SysMetaCityDto sysMetaCityDto) {
+    public ExecuteResult<String> save(SysFunctionLogDto sysFunctionLogDto) {
         ExecuteResult<String> result = new ExecuteResult<String>();
         try{
-            SysMetaCity sysMetaCity = new SysMetaCity();
-            revert(sysMetaCityDto,sysMetaCity);
-            boolean flag = sysMetaCityService.save(sysMetaCity);
+            SysFunctionLog sysFunctionLog = new SysFunctionLog();
+            revert(sysFunctionLogDto,sysFunctionLog);
+            boolean flag = sysFunctionLogService.save(sysFunctionLog);
             if(!flag){
                 result.addErrorMessage("保存失败。");
             }
@@ -74,13 +74,12 @@ public class SysMetaCityServiceClientImpl extends BaseServiceClient<SysMetaCity,
     }
 
     @Override
-    public ExecuteResult<String> update(SysMetaCityDto sysMetaCityDto) {
+    public ExecuteResult<String> update(SysFunctionLogDto sysFunctionLogDto) {
         ExecuteResult<String> result = new ExecuteResult<String>();
         try{
-            SysMetaCity sysMetaCity = new SysMetaCity();
-            revert(sysMetaCityDto,sysMetaCity);
-
-            boolean flag = sysMetaCityService.updateById(sysMetaCity);
+            SysFunctionLog sysFunctionLog = new SysFunctionLog();
+            revert(sysFunctionLogDto,sysFunctionLog);
+            boolean flag = sysFunctionLogService.updateById(sysFunctionLog);
             if(!flag){
                 result.addErrorMessage("更新失败。");
             }
@@ -96,7 +95,7 @@ public class SysMetaCityServiceClientImpl extends BaseServiceClient<SysMetaCity,
     public ExecuteResult<String> delete(Long id) {
         ExecuteResult<String> result = new ExecuteResult<String>();
         try{
-            boolean flag = sysMetaCityService.removeById(id);
+            boolean flag = sysFunctionLogService.removeById(id);
             if(!flag){
                 result.addErrorMessage("删除失败。");
             }
@@ -112,7 +111,7 @@ public class SysMetaCityServiceClientImpl extends BaseServiceClient<SysMetaCity,
     public ExecuteResult<String> deleteBatch(List<Long> ids) {
         ExecuteResult<String> result = new ExecuteResult<String>();
         try{
-            boolean flag = sysMetaCityService.removeByIds(ids);
+            boolean flag = sysFunctionLogService.removeByIds(ids);
             if(!flag){
                 result.addErrorMessage("批量删除失败。");
             }
@@ -125,22 +124,22 @@ public class SysMetaCityServiceClientImpl extends BaseServiceClient<SysMetaCity,
     }
 
     @Override
-    public Page<SysMetaCityDto> getPage(Page<SysMetaCityDto> pageDto,SysMetaCityDto sysMetaCityDto) {
-        Page<SysMetaCity> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
+    public Page<SysFunctionLogDto> getPage(Page<SysFunctionLogDto> pageDto,SysFunctionLogDto sysFunctionLogDto) {
+        Page<SysFunctionLog> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
         page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
         page.condition().putAll(pageDto.condition());
 
-        SysMetaCity sysMetaCity = new SysMetaCity();
-        revert(sysMetaCityDto,sysMetaCity);
+        SysFunctionLog sysFunctionLog = new SysFunctionLog();
+        revert(sysFunctionLogDto,sysFunctionLog);
 
-        QueryWrapper<SysMetaCity> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(sysMetaCity);
+        QueryWrapper<SysFunctionLog> wrapper = new QueryWrapper<>();
+        wrapper.setEntity(sysFunctionLog);
 
-        List<SysMetaCityDto> sysMetaCityDtoList = convertList(sysMetaCityService.page(page,wrapper).getRecords(),SysMetaCityDto.class);
-        pageDto.setTotal(sysMetaCityService.count(wrapper));
-        pageDto.setRecords(sysMetaCityDtoList);
+        List<SysFunctionLogDto> sysFunctionLogDtoList = convertList(sysFunctionLogService.page(page,wrapper).getRecords(),SysFunctionLogDto.class);
+        pageDto.setTotal(sysFunctionLogService.count(wrapper));
+        pageDto.setRecords(sysFunctionLogDtoList);
         return pageDto;
     }
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/log/SysFunctionLogMapper.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.log.biz.mapper.SysFunctionLogMapper">
+
+
+
+</mapper>

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/SysMessageDto.java

@@ -1,41 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-@Data
-public class SysMessageDto  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;
-/**
- * 创建人       db_column: CREATE_USER
- */
-private Long createUser;
-/**
- * 标题       db_column: MSG_TITLE
- */
-private String msgTitle;
-//columns END
-
-
-//创建人姓名
-    private String createUserName;
-
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/SysMetaAreaDto.java

@@ -1,28 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-@Data
-public class SysMetaAreaDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-/**
- * 主键       db_column: id
- */
-private Long id;
-/**
- * 编码       db_column: code
- */
-private Object code;
-/**
- * 显示中文名       db_column: label
- */
-private Object label;
-/**
- * 父级城市名       db_column: parent_code
- */
-private Object parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/SysMetaCityDto.java

@@ -1,28 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-@Data
-public class SysMetaCityDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-/**
- * 主键       db_column: ID
- */
-private Long id;
-/**
- * 编码       db_column: CODE
- */
-private Long code;
-/**
- * label       db_column: LABEL
- */
-private String label;
-/**
- * 父级省编码       db_column: PARENT_CODE
- */
-private Long parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/SysMetaProvinceDto.java

@@ -1,30 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SysMetaProvinceDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-/**
- * 主键       db_column: ID
- */
-private Long id;
-/**
- * 编码       db_column: CODE
- */
-private Long code;
-/**
- * 中文名       db_column
- * : LABEL
- */
-private String label;
-//columns END
-
-    private List<SysMetaCityDto> citys;
-
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/SysMetaStreetDto.java

@@ -1,28 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-@Data
-public class SysMetaStreetDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-/**
- * 主键       db_column: id
- */
-private Long id;
-/**
- * 编码       db_column: code
- */
-private Object code;
-/**
- * 显示中文名       db_column: label
- */
-private Object label;
-/**
- * 父级区编码       db_column: parent_code
- */
-private Object parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/dto/TbUserDto.java

@@ -1,32 +0,0 @@
-package io.platform.sys.dto;
-
-import lombok.Data;
-
-@Data
-public class TbUserDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635451L;
-
-
-/**
- * userId       db_column: user_id
- */
-private Long userId;
-/**
- * 用户名       db_column: username
- */
-private String username;
-/**
- * 手机号       db_column: mobile
- */
-private String mobile;
-/**
- * 密码       db_column: password
- */
-private String password;
-/**
- * 创建时间       db_column: create_time
- */
-private java.util.Date createTime;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/SysMessageServiceClient.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/SysMetaAreaServiceClient.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/SysMetaProvinceServiceClient.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/SysMetaStreetServiceClient.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-api/src/main/java/io/platform/sys/service/client/api/TbUserServiceClient.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysMessage.java

@@ -1,63 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-@TableName("SYS_MESSAGE")
-@KeySequence(value="SEQ_BIZ",clazz=Long.class)
-public class SysMessage extends Model<SysMessage>  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;
-
-    /**
-     * 创建人       db_column: CREATE_USER
-     */
-    @TableField("CREATE_USER")
-    private Long createUser;
-
-    /**
-     * 标题       db_column: MSG_TITLE
-     */
-    @TableField("MSG_TITLE")
-    private String msgTitle;
-//columns END
-
-    @TableField("CREATE_USER_NAME")
-    private String createUserName;
-
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysMetaArea.java

@@ -1,42 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-@TableName("SYS_META_AREA")
-@KeySequence(value="SEQ_BIZ",clazz=Long.class)
-public class SysMetaArea extends Model<SysMetaArea>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-
-    /**
-     * 主键       db_column: id
-     */
-    @TableField("ID")
-    private Long id;
-
-    /**
-     * 编码       db_column: code
-     */
-    @TableField("CODE")
-    private Object code;
-
-    /**
-     * 显示中文名       db_column: label
-     */
-    @TableField("LABEL")
-    private Object label;
-
-    /**
-     * 父级城市名       db_column: parent_code
-     */
-    @TableField("PARENT_CODE")
-    private Object parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysMetaCity.java

@@ -1,47 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-@TableName("SYS_META_CITY")
-@KeySequence(value="SEQ_BIZ",clazz=Long.class)
-public class SysMetaCity extends Model<SysMetaCity>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-    /**
-     * 主键       db_column: ID
-     */
-    @TableId(value="ID", type= IdType.INPUT)
-    private Long id;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    /**
-     * 编码       db_column: CODE
-     */
-    @TableField("CODE")
-    private Long code;
-
-    /**
-     * label       db_column: LABEL
-     */
-    @TableField("LABEL")
-    private String label;
-
-    /**
-     * 父级省编码       db_column: PARENT_CODE
-     */
-    @TableField("PARENT_CODE")
-    private Long parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysMetaProvince.java

@@ -1,48 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-@TableName("SYS_META_PROVINCE")
-@KeySequence(value="SEQ_BIZ",clazz=Long.class)
-public class SysMetaProvince extends Model<SysMetaProvince>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-    /**
-     * 主键       db_column: ID
-     */
-    @TableId(value="ID", type= IdType.INPUT)
-    private Long id;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    /**
-     * 编码       db_column: CODE
-     */
-    @TableField("CODE")
-    private Long code;
-
-    /**
-     * 中文名       db_column: LABEL
-     */
-    @TableField("LABEL")
-    private String label;
-//columns END
-
-    @TableField(exist = false)
-    private List<SysMetaCity> citys;
-
-
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysMetaStreet.java

@@ -1,42 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-@TableName("SYS_META_STREET")
-@KeySequence(value="SEQ_BIZ",clazz=Long.class)
-public class SysMetaStreet extends Model<SysMetaStreet>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
-
-
-
-    /**
-     * 主键       db_column: id
-     */
-    @TableField("ID")
-    private Long id;
-
-    /**
-     * 编码       db_column: code
-     */
-    @TableField("CODE")
-    private Object code;
-
-    /**
-     * 显示中文名       db_column: label
-     */
-    @TableField("LABEL")
-    private Object label;
-
-    /**
-     * 父级区编码       db_column: parent_code
-     */
-    @TableField("PARENT_CODE")
-    private Object parentCode;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/SysUserToken.java

@@ -12,7 +12,8 @@ import java.io.Serializable;
 @Data
 @TableName("SYS_USER_TOKEN")
 public class SysUserToken extends Model<SysUserToken>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635340L;
+
+    private static final long serialVersionUID = 5454155825314635340L;
 
 
     /**

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/entity/TbUser.java

@@ -1,53 +0,0 @@
-package io.platform.sys.biz.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("TB_USER")
-@KeySequence(value="SEQ_SYS",clazz=Long.class)
-public class TbUser extends Model<TbUser>  implements Serializable{
-private static final long serialVersionUID = 5454155825314635351L;
-
-
-    /**
-     * userId       db_column: user_id
-     */
-    @TableId(value="USER_ID", type= IdType.INPUT)
-    private Long userId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.userId;
-    }
-
-    /**
-     * 用户名       db_column: username
-     */
-    @TableField("USERNAME")
-    private String username;
-
-    /**
-     * 手机号       db_column: mobile
-     */
-    @TableField("MOBILE")
-    private String mobile;
-
-    /**
-     * 密码       db_column: password
-     */
-    @TableField("PASSWORD")
-    private String password;
-
-    /**
-     * 创建时间       db_column: create_time
-     */
-    @TableField("CREATE_TIME")
-    private java.util.Date createTime;
-//columns END
-
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/SysMessageMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/SysMetaAreaMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/SysMetaCityMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/SysMetaProvinceMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/SysMetaStreetMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/mapper/TbUserMapper.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/SysMessageService.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/SysMetaAreaService.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/SysMetaCityService.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/SysMetaProvinceService.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/SysMetaStreetService.java

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

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/biz/service/TbUserService.java

@@ -1,19 +0,0 @@
-
-package io.platform.sys.biz.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.platform.sys.biz.entity.TbUser;
-import io.platform.sys.biz.mapper.TbUserMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-
-@Service("tbUserService")
-public class TbUserService extends ServiceImpl<TbUserMapper, TbUser> {
-
-    public List<TbUser> selectByMap(Map<String, Object> map) {
-        return baseMapper.selectByMap(map);
-    }
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysMessageServiceClientImpl.java

@@ -1,157 +0,0 @@
-
-package io.platform.sys.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.sys.biz.entity.SysMessage;
-import io.platform.sys.biz.service.SysMessageService;
-import io.platform.sys.dto.SysMessageDto;
-import io.platform.sys.service.client.api.SysMessageServiceClient;
-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.Date;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Component
-@Service()
-public class SysMessageServiceClientImpl extends BaseServiceClient<SysMessage,SysMessageDto> implements SysMessageServiceClient {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Resource
-    private SysMessageService sysMessageService;
-
-    @Override
-    public SysMessageDto queryObject(Long id) {
-        SysMessage sysMessage = sysMessageService.getById(id);
-        SysMessageDto sysMessageDto = new SysMessageDto();
-        BeanUtils.copyProperties(sysMessage,sysMessageDto);
-        return sysMessageDto;
-    }
-
-    @Override
-    public List<SysMessageDto> queryList(Map<String, Object> map) {
-        List<SysMessage> sysMessageList = sysMessageService.selectByMap(map);
-        return convertList(sysMessageList,SysMessageDto.class);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<SysMessage> ew = new QueryWrapper<>();
-        ew.allEq(map);
-        return sysMessageService.count(ew);
-    }
-
-    @Override
-    public ExecuteResult<String> save(SysMessageDto sysMessageDto, String username, Long userId) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMessage sysMessage = new SysMessage();
-            revert(sysMessageDto,sysMessage);
-            // 创建时间、创建人、创建人userName
-            sysMessage.setCreateTime(new Date());
-            sysMessage.setCreateUser(userId);
-            sysMessage.setCreateUserName(username);
-            if ("".equals(sysMessage.getMsgTitle())) {
-                sysMessage.setMsgTitle(null);
-            }
-            boolean flag = sysMessageService.save(sysMessage);
-            if(!flag){
-                result.addErrorMessage("保存失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 保存错误：" + e.toString(), e);
-            result.addErrorMessage("保存错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public ExecuteResult<String> update(SysMessageDto sysMessageDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMessage sysMessage = new SysMessage();
-            revert(sysMessageDto,sysMessage);
-
-            boolean flag = sysMessageService.updateById(sysMessage);
-            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 = sysMessageService.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 = sysMessageService.removeByIds(ids);
-            if(!flag){
-                result.addErrorMessage("批量删除失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 删除错误：" + e.toString(), e);
-            result.addErrorMessage("删除错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public Page<SysMessageDto> getPage(Page<SysMessageDto> pageDto,SysMessageDto sysMessageDto) {
-        Page<SysMessage> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
-        page.setAsc(pageDto.ascs());
-        page.setDesc(pageDto.descs());
-        // page.condition().putAll(pageDto.condition());
-
-        SysMessage sysMessage = new SysMessage();
-        revert(sysMessageDto,sysMessage);
-        if ("".equals(sysMessage.getContentType())) {
-            sysMessage.setContentType(null);
-        }
-        if ("".equals(sysMessage.getMsgTitle())) {
-            sysMessage.setMsgTitle(null);
-        }
-        QueryWrapper<SysMessage> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(sysMessage);
-        List<SysMessageDto> sysMessageDtoList = convertList(sysMessageService.page(page,wrapper).getRecords(),SysMessageDto.class);
-        pageDto.setTotal(sysMessageService.count(wrapper));
-        pageDto.setRecords(sysMessageDtoList);
-        return pageDto;
-    }
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysMetaAreaServiceClientImpl.java

@@ -1,146 +0,0 @@
-
-package io.platform.sys.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.sys.biz.entity.SysMetaArea;
-import io.platform.sys.biz.service.SysMetaAreaService;
-import io.platform.sys.dto.SysMetaAreaDto;
-import io.platform.sys.service.client.api.SysMetaAreaServiceClient;
-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;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Component
-@Service()
-public class SysMetaAreaServiceClientImpl extends BaseServiceClient<SysMetaArea,SysMetaAreaDto> implements SysMetaAreaServiceClient {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Resource
-    private SysMetaAreaService sysMetaAreaService;
-
-    @Override
-    public SysMetaAreaDto queryObject(Long id) {
-        SysMetaArea sysMetaArea = sysMetaAreaService.getById(id);
-        SysMetaAreaDto sysMetaAreaDto = new SysMetaAreaDto();
-        BeanUtils.copyProperties(sysMetaArea,sysMetaAreaDto);
-        return sysMetaAreaDto;
-    }
-
-    @Override
-    public List<SysMetaAreaDto> queryList(Map<String, Object> map) {
-        List<SysMetaArea> sysMetaAreaList = sysMetaAreaService.selectByMap(map);
-        return convertList(sysMetaAreaList,SysMetaAreaDto.class);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<SysMetaArea> ew = new QueryWrapper<>();
-        ew.allEq(map);
-        return sysMetaAreaService.count(ew);
-    }
-
-    @Override
-    public ExecuteResult<String> save(SysMetaAreaDto sysMetaAreaDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaArea sysMetaArea = new SysMetaArea();
-            revert(sysMetaAreaDto,sysMetaArea);
-            boolean flag = sysMetaAreaService.save(sysMetaArea);
-            if(!flag){
-                result.addErrorMessage("保存失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 保存错误：" + e.toString(), e);
-            result.addErrorMessage("保存错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public ExecuteResult<String> update(SysMetaAreaDto sysMetaAreaDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaArea sysMetaArea = new SysMetaArea();
-            revert(sysMetaAreaDto,sysMetaArea);
-
-            boolean flag = sysMetaAreaService.updateById(sysMetaArea);
-            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 = sysMetaAreaService.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 = sysMetaAreaService.removeByIds(ids);
-            if(!flag){
-                result.addErrorMessage("批量删除失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 删除错误：" + e.toString(), e);
-            result.addErrorMessage("删除错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public Page<SysMetaAreaDto> getPage(Page<SysMetaAreaDto> pageDto,SysMetaAreaDto sysMetaAreaDto) {
-        Page<SysMetaArea> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
-
-        page.setAsc(pageDto.ascs());
-        page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
-
-        SysMetaArea sysMetaArea = new SysMetaArea();
-        revert(sysMetaAreaDto,sysMetaArea);
-
-        QueryWrapper<SysMetaArea> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(sysMetaArea);
-
-        List<SysMetaAreaDto> sysMetaAreaDtoList = convertList(sysMetaAreaService.page(page,wrapper).getRecords(),SysMetaAreaDto.class);
-        pageDto.setTotal(sysMetaAreaService.count(wrapper));
-        pageDto.setRecords(sysMetaAreaDtoList);
-        return pageDto;
-    }
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysMetaProvinceServiceClientImpl.java

@@ -1,168 +0,0 @@
-
-package io.platform.sys.service.client.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-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.sys.biz.entity.SysMetaCity;
-import io.platform.sys.biz.entity.SysMetaProvince;
-import io.platform.sys.biz.service.SysMetaCityService;
-import io.platform.sys.biz.service.SysMetaProvinceService;
-import io.platform.sys.dto.SysMetaProvinceDto;
-import io.platform.sys.service.client.api.SysMetaProvinceServiceClient;
-
-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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Component
-@Service()
-public class SysMetaProvinceServiceClientImpl extends BaseServiceClient<SysMetaProvince,SysMetaProvinceDto> implements SysMetaProvinceServiceClient {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Resource
-    private SysMetaProvinceService sysMetaProvinceService;
-    @Resource
-    private SysMetaCityService sysMetaCityService;
-
-    @Override
-    public SysMetaProvinceDto queryObject(Long id) {
-        SysMetaProvince sysMetaProvince = sysMetaProvinceService.getById(id);
-        SysMetaProvinceDto sysMetaProvinceDto = new SysMetaProvinceDto();
-        BeanUtils.copyProperties(sysMetaProvince,sysMetaProvinceDto);
-        return sysMetaProvinceDto;
-    }
-
-    @Override
-    public List<SysMetaProvinceDto> queryList(Map<String, Object> map) {
-        List<SysMetaProvince> sysMetaProvinceList = sysMetaProvinceService.selectByMap(map);
-        return convertList(sysMetaProvinceList,SysMetaProvinceDto.class);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<SysMetaProvince> ew = new QueryWrapper<>();
-        ew.allEq(map);
-        return sysMetaProvinceService.count(ew);
-    }
-
-    @Override
-    public ExecuteResult<String> save(SysMetaProvinceDto sysMetaProvinceDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaProvince sysMetaProvince = new SysMetaProvince();
-            revert(sysMetaProvinceDto,sysMetaProvince);
-            boolean flag = sysMetaProvinceService.save(sysMetaProvince);
-            if(!flag){
-                result.addErrorMessage("保存失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 保存错误：" + e.toString(), e);
-            result.addErrorMessage("保存错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public ExecuteResult<String> update(SysMetaProvinceDto sysMetaProvinceDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaProvince sysMetaProvince = new SysMetaProvince();
-            revert(sysMetaProvinceDto,sysMetaProvince);
-
-            boolean flag = sysMetaProvinceService.updateById(sysMetaProvince);
-            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 = sysMetaProvinceService.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 = sysMetaProvinceService.removeByIds(ids);
-            if(!flag){
-                result.addErrorMessage("批量删除失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 删除错误：" + e.toString(), e);
-            result.addErrorMessage("删除错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public Page<SysMetaProvinceDto> getPage(Page<SysMetaProvinceDto> pageDto,SysMetaProvinceDto sysMetaProvinceDto) {
-        Page<SysMetaProvince> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
-
-        page.setAsc(pageDto.ascs());
-        page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
-
-        SysMetaProvince sysMetaProvince = new SysMetaProvince();
-        revert(sysMetaProvinceDto,sysMetaProvince);
-
-        QueryWrapper<SysMetaProvince> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(sysMetaProvince);
-
-        List<SysMetaProvinceDto> sysMetaProvinceDtoList = convertList(sysMetaProvinceService.page(page,wrapper).getRecords(),SysMetaProvinceDto.class);
-        pageDto.setTotal(sysMetaProvinceService.count(wrapper));
-        pageDto.setRecords(sysMetaProvinceDtoList);
-        return pageDto;
-    }
-
-    // 获取省市数据
-    @Override
-    public Object getProvinceAndCity() {
-        List<SysMetaProvince> metaProvinces = sysMetaProvinceService.selectByMap(null);
-        Map<String,Object> map = new HashMap<>();
-        for (int i = 0; i < metaProvinces.size(); i++) {
-            // 根据省份查市
-            SysMetaCity sysMetaCity = new SysMetaCity();
-            map.put("PARENT_CODE",metaProvinces.get(i).getCode());
-            List<SysMetaCity> sysMetaCities = sysMetaCityService.selectByMap(map);
-            metaProvinces.get(i).setCitys(sysMetaCities);
-        }
-        return metaProvinces;
-    }
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysMetaStreetServiceClientImpl.java

@@ -1,146 +0,0 @@
-
-package io.platform.sys.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.sys.biz.entity.SysMetaStreet;
-import io.platform.sys.biz.service.SysMetaStreetService;
-import io.platform.sys.dto.SysMetaStreetDto;
-import io.platform.sys.service.client.api.SysMetaStreetServiceClient;
-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;
-
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Component
-@Service()
-public class SysMetaStreetServiceClientImpl extends BaseServiceClient<SysMetaStreet,SysMetaStreetDto> implements SysMetaStreetServiceClient {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Resource
-    private SysMetaStreetService sysMetaStreetService;
-
-    @Override
-    public SysMetaStreetDto queryObject(Long id) {
-        SysMetaStreet sysMetaStreet = sysMetaStreetService.getById(id);
-        SysMetaStreetDto sysMetaStreetDto = new SysMetaStreetDto();
-        BeanUtils.copyProperties(sysMetaStreet,sysMetaStreetDto);
-        return sysMetaStreetDto;
-    }
-
-    @Override
-    public List<SysMetaStreetDto> queryList(Map<String, Object> map) {
-        List<SysMetaStreet> sysMetaStreetList = sysMetaStreetService.selectByMap(map);
-        return convertList(sysMetaStreetList,SysMetaStreetDto.class);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<SysMetaStreet> ew = new QueryWrapper<>();
-        ew.allEq(map);
-        return sysMetaStreetService.count(ew);
-    }
-
-    @Override
-    public ExecuteResult<String> save(SysMetaStreetDto sysMetaStreetDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaStreet sysMetaStreet = new SysMetaStreet();
-            revert(sysMetaStreetDto,sysMetaStreet);
-            boolean flag = sysMetaStreetService.save(sysMetaStreet);
-            if(!flag){
-                result.addErrorMessage("保存失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 保存错误：" + e.toString(), e);
-            result.addErrorMessage("保存错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public ExecuteResult<String> update(SysMetaStreetDto sysMetaStreetDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try{
-            SysMetaStreet sysMetaStreet = new SysMetaStreet();
-            revert(sysMetaStreetDto,sysMetaStreet);
-
-            boolean flag = sysMetaStreetService.updateById(sysMetaStreet);
-            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 = sysMetaStreetService.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 = sysMetaStreetService.removeByIds(ids);
-            if(!flag){
-                result.addErrorMessage("批量删除失败。");
-            }
-        }
-        catch (Exception e) {
-            logger.error(" 删除错误：" + e.toString(), e);
-            result.addErrorMessage("删除错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public Page<SysMetaStreetDto> getPage(Page<SysMetaStreetDto> pageDto,SysMetaStreetDto sysMetaStreetDto) {
-        Page<SysMetaStreet> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
-
-        page.setAsc(pageDto.ascs());
-        page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
-
-        SysMetaStreet sysMetaStreet = new SysMetaStreet();
-        revert(sysMetaStreetDto,sysMetaStreet);
-
-        QueryWrapper<SysMetaStreet> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(sysMetaStreet);
-
-        List<SysMetaStreetDto> sysMetaStreetDtoList = convertList(sysMetaStreetService.page(page,wrapper).getRecords(),SysMetaStreetDto.class);
-        pageDto.setTotal(sysMetaStreetService.count(wrapper));
-        pageDto.setRecords(sysMetaStreetDtoList);
-        return pageDto;
-    }
-}

sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/TbUserServiceClientImpl.java

@@ -1,134 +0,0 @@
-
-package io.platform.sys.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.sys.biz.entity.TbUser;
-import io.platform.sys.biz.service.TbUserService;
-import io.platform.sys.dto.TbUserDto;
-import io.platform.sys.service.client.api.TbUserServiceClient;
-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;
-
-/**
- * Created by sevelli on 2017/8/31.
- */
-@Component
-@Service()
-public class TbUserServiceClientImpl extends BaseServiceClient<TbUser, TbUserDto> implements TbUserServiceClient {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Resource
-    private TbUserService tbUserService;
-
-    @Override
-    public TbUserDto queryObject(Long id) {
-        TbUser tbUser = tbUserService.getById(id);
-        TbUserDto tbUserDto = new TbUserDto();
-        BeanUtils.copyProperties(tbUser, tbUserDto);
-        return tbUserDto;
-    }
-
-    @Override
-    public List<TbUserDto> queryList(Map<String, Object> map) {
-        List<TbUser> tbUserList = tbUserService.selectByMap(map);
-        return convertList(tbUserList, TbUserDto.class);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        QueryWrapper<TbUser> ew = new QueryWrapper<>();
-        ew.allEq(map);
-        return tbUserService.count(ew);
-    }
-
-    @Override
-    public ExecuteResult<String> save(TbUserDto tbUserDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try {
-            TbUser tbUser = new TbUser();
-            revert(tbUserDto, tbUser);
-            boolean flag = tbUserService.save(tbUser);
-            if (!flag) {
-                result.addErrorMessage("保存失败。");
-            }
-        } catch (Exception e) {
-            logger.error(" 保存错误：" + e.toString(), e);
-            result.addErrorMessage("保存错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public ExecuteResult<String> update(TbUserDto tbUserDto) {
-        ExecuteResult<String> result = new ExecuteResult<String>();
-        try {
-            TbUser tbUser = new TbUser();
-            revert(tbUserDto, tbUser);
-            boolean flag = tbUserService.updateById(tbUser);
-            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 = tbUserService.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 = tbUserService.removeByIds(ids);
-            if (!flag) {
-                result.addErrorMessage("批量删除失败。");
-            }
-        } catch (Exception e) {
-            logger.error(" 删除错误：" + e.toString(), e);
-            result.addErrorMessage("删除错误：" + e.toString());
-        }
-        return result;
-    }
-
-    @Override
-    public Page<TbUserDto> getPage(Page<TbUserDto> pageDto, TbUserDto tbUserDto) {
-        Page<TbUser> page = new Page<>(pageDto.getCurrent(), pageDto.getSize());
-//        page.setAsc(pageDto.isAsc());
-//        page.setOrderByField(pageDto.getOrderByField());
-//        page.setCondition(pageDto.getCondition());
-
-        TbUser tbUser = new TbUser();
-        revert(tbUserDto,tbUser);
-        QueryWrapper<TbUser> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(tbUser);
-
-        List<TbUserDto> tbUserDtoList = convertList(tbUserService.page(page, wrapper).getRecords(), TbUserDto.class);
-        pageDto.setTotal(page.getTotal());
-        pageDto.setRecords(tbUserDtoList);
-        return pageDto;
-    }
-}