活动模块细节修改、 新增省份查询

sailun-allsteel-admin-rest/src/main/java/io/platform/activity/web/controller/rest/ActivityMaterialRestController.java

@@ -43,6 +43,15 @@ public class ActivityMaterialRestController extends AbstractController {
 	@RequestMapping("/page")
 	@RequiresPermissions("activity:activityMaterial:page")
 	public R page(Page page,ActivityMaterialDto activityMaterialDto){
+		if ("".equals(activityMaterialDto.getActivityId())) {
+			activityMaterialDto.setActivityId(null);
+		}
+		if ("".equals(activityMaterialDto.getMatnr())) {
+			activityMaterialDto.setMatnr(null);
+		}
+		if ("".equals(activityMaterialDto.getMatnrName())) {
+			activityMaterialDto.setMatnrName(null);
+		}
 		return R.ok().put("page", activityMaterialServiceRemote.getPage(page,activityMaterialDto));
 	}
 	/**

sailun-allsteel-admin-rest/src/main/java/io/platform/activity/web/controller/rest/ActivityRestController.java

@@ -2,8 +2,12 @@
 package io.platform.activity.web.controller.rest;
 
 
+import io.platform.activity.dto.ActivityAreaDto;
 import io.platform.activity.dto.ActivityDto;
+import io.platform.activity.service.client.api.ActivityAreaServiceClient;
+import io.platform.activity.web.remote.ActivityAreaServiceRemote;
 import io.platform.activity.web.remote.ActivityServiceRemote;
+import io.platform.base.common.utils.ShiroUtils;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
@@ -16,6 +20,7 @@ import io.platform.base.common.validator.ValidatorUtils;
 import io.platform.base.common.annotation.SysLog;
 import io.platform.base.common.utils.ExecuteResult;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +31,9 @@ public class ActivityRestController extends AbstractController {
 
     @Autowired
 	private ActivityServiceRemote activityServiceRemote;
+
+    @Autowired
+	private ActivityAreaServiceRemote activityAreaServiceRemote;
 	
 	/**
 	 * 所有列表
@@ -63,7 +71,10 @@ public class ActivityRestController extends AbstractController {
 	@RequiresPermissions("activity:activity:save")
 	public R save(@RequestBody ActivityDto activityDto){
         ValidatorUtils.validateEntity(activityDto);
-        ExecuteResult<String> result= activityServiceRemote.save(activityDto);
+
+		Long userId = ShiroUtils.getUserId();
+		activityDto.setCreateBy(userId+"");
+		ExecuteResult<String> result= activityServiceRemote.save(activityDto);
         if(result.isSuccess()){
             return R.ok(result.getSuccessMessage());
         }else{
@@ -102,4 +113,18 @@ public class ActivityRestController extends AbstractController {
         }
 	}
 
+
+	/**
+	 * 根据活动ID 获取活动地区列表
+	 * @param activityId
+	 * @return
+	 */
+	@RequestMapping("/getAreas")
+	public R getAreas(@RequestBody Long activityId) {
+		HashMap<String,Object> queryMap = new HashMap<>();
+		queryMap.put("ACTIVITY_ID",activityId);
+		List<ActivityAreaDto> activityAreaDtos = this.activityAreaServiceRemote.getList(queryMap);
+		return R.ok().put("actAreas",activityAreaDtos);
+	}
+
 }

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

@@ -2,6 +2,8 @@
 package io.platform.homepage.web.controller.rest;
 
 
+import io.platform.base.common.utils.FtpUtils;
+
 import io.platform.homepage.dto.ConfigBrandDto;
 import io.platform.homepage.web.remote.ConfigBrandServiceRemote;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +17,10 @@ import io.platform.base.common.validator.ValidatorUtils;
 
 import io.platform.base.common.annotation.SysLog;
 import io.platform.base.common.utils.ExecuteResult;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +31,10 @@ public class ConfigBrandRestController extends AbstractController {
 
     @Autowired
 	private ConfigBrandServiceRemote configBrandServiceRemote;
+
+
+    @Autowired
+	private FtpUtils ftpUtils;
 	
 	/**
 	 * 所有列表
@@ -102,4 +111,26 @@ public class ConfigBrandRestController extends AbstractController {
         }
 	}
 
+
+	/**
+	 * 文件上传
+	 * @return
+	 */
+	@RequestMapping("/uploadFile")
+	public R uploadFile(@RequestParam("file") MultipartFile file) {
+		file.getOriginalFilename();
+		String fileName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+		String url = null;
+		try {
+			url = ftpUtils.defaultUpload(null, fileName, (FileInputStream) file.getInputStream());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return R.ok().put("data",url);
+	}
+
+
+
+
+
 }

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

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

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

sailun-allsteel-admin-rest/src/main/resources/application-dev.yml

@@ -23,12 +23,13 @@ spring:
       pool:
         max-idle: 8
         min-idle: 0
+
 ftp:
-  userName: yhjz_dev
-  password: dev@yhjz
-  ftpHostName: 117.50.20.112
+  userName: sailun_dev
+  password: sailun_dev@sailun
+  ftpHostName: 10.97.1.106
   port: 21
-  dataIp: http://117.50.20.112/
-  rootPath: /upload/admin/  #必须有"/"
-  httpAddr: http://117.50.20.112/upload/
-  tempDir: D:/bg
+  dataIp: http://10.97.1.106/
+  rootPath: /sailun-allsteel-admin/  #必须有"/"
+  httpAddr: https://b2bcnfile.sailuntire.com/upload/
+  tempDir: /application/temp

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/activity/dto/ActivityDto.java

@@ -46,7 +46,7 @@ private static final long serialVersionUID = 5454155825314635342L;
     /**
      * 经销商积分       db_column: AGETN_INTEGRAL
      */
-    private Long agetnIntegral;
+    private Long agentIntegral;
     /**
      * 经销商返现       db_column: AGENT_BONUS
      */

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

@@ -7,26 +7,26 @@ public class ConfigSignLvDto  implements java.io.Serializable{
 private static final long serialVersionUID = 5454155825314635342L;
 
 
-/**
- * 主键       db_column: MAIN_ID
- */
-private Long mainId;
-/**
- * ABCD       db_column: SIGN_LV
- */
-private String signLv;
-/**
- * 条数       db_column: NUM_TASK
- */
-private Integer numTask;
-/**
- * 品牌       db_column: BRAND
- */
-private String brand;
-/**
- * 品牌识别码       db_column: CODE
- */
-private String code;
-//columns END
+    /**
+     * 主键       db_column: MAIN_ID
+     */
+    private Long mainId;
+    /**
+     * ABCD       db_column: SIGN_LV
+     */
+    private String signLv;
+    /**
+     * 条数       db_column: NUM_TASK
+     */
+    private Integer numTask;
+    /**
+     * 品牌       db_column: BRAND
+     */
+    private String brand;
+    /**
+     * 品牌识别码       db_column: CODE
+     */
+    private String brandCode;
+    //columns END
 
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/biz/entity/Activity.java

@@ -77,8 +77,8 @@ public class Activity extends Model<Activity>  implements Serializable{
     /**
      * 经销商积分       db_column: AGETN_INTEGRAL
      */
-    @TableField("AGETN_INTEGRAL")
-    private Long agetnIntegral;
+    @TableField("AGENT_INTEGRAL")
+    private Long agentIntegral;
 
     /**
      * 经销商返现       db_column: AGENT_BONUS

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/service/client/impl/ActivityAreaServiceClientImpl.java

@@ -127,9 +127,9 @@ public class ActivityAreaServiceClientImpl extends BaseServiceClient<ActivityAre
     public Page<ActivityAreaDto> getPage(Page<ActivityAreaDto> pageDto,ActivityAreaDto activityAreaDto) {
         Page<ActivityArea> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         ActivityArea activityArea = new ActivityArea();
         revert(activityAreaDto,activityArea);

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/service/client/impl/ActivityMatchServiceClientImpl.java

@@ -127,9 +127,9 @@ public class ActivityMatchServiceClientImpl extends BaseServiceClient<ActivityMa
     public Page<ActivityMatchDto> getPage(Page<ActivityMatchDto> pageDto,ActivityMatchDto activityMatchDto) {
         Page<ActivityMatch> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+       /* page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         ActivityMatch activityMatch = new ActivityMatch();
         revert(activityMatchDto,activityMatch);

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/service/client/impl/ActivityMaterialServiceClientImpl.java

@@ -127,9 +127,9 @@ public class ActivityMaterialServiceClientImpl extends BaseServiceClient<Activit
     public Page<ActivityMaterialDto> getPage(Page<ActivityMaterialDto> pageDto,ActivityMaterialDto activityMaterialDto) {
         Page<ActivityMaterial> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         ActivityMaterial activityMaterial = new ActivityMaterial();
         revert(activityMaterialDto,activityMaterial);

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/service/client/impl/ActivityServiceClientImpl.java

@@ -20,6 +20,7 @@ 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;
 
@@ -61,6 +62,8 @@ public class ActivityServiceClientImpl extends BaseServiceClient<Activity,Activi
         try{
             Activity activity = new Activity();
             revert(activityDto,activity);
+            activity.setCreateDate(new Date());
+
             boolean flag = activityService.save(activity);
             if(!flag){
                 result.addErrorMessage("保存失败。");
@@ -127,9 +130,9 @@ public class ActivityServiceClientImpl extends BaseServiceClient<Activity,Activi
     public Page<ActivityDto> getPage(Page<ActivityDto> pageDto,ActivityDto activityDto) {
         Page<Activity> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         Activity activity = new Activity();
         revert(activityDto,activity);

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

@@ -47,8 +47,8 @@ public class ConfigSignLv extends Model<ConfigSignLv>  implements Serializable{
     /**
      * 品牌识别码       db_column: CODE
      */
-    @TableField("CODE")
-    private String code;
+    @TableField("BRAND_CODE")
+    private String brandCode;
 //columns END
 
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/store/StoreAgentBrandLvLogMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="io.platform.store.biz.mapper.StoreAgentBrandLvLogMapper">
 
 
-    <select id="getStoreBrandList" parameterType="long" resultMap="io.platform.base.vo.StoreBrandVO">
+    <!--<select id="getStoreBrandList" parameterType="long" resultMap="io.platform.base.vo.StoreBrandVO">
         SELECT BRAND_CODE brandCode,BEAND brandName FROM APP_STORE_AGENT_BRAND_LV WHERE #{storeId}
-    </select>
+    </select>-->
 
 
 </mapper>

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

@@ -0,0 +1,24 @@
+package io.platform.sys.dto;
+
+import lombok.Data;
+
+@Data
+public class MetaProvinceDto  implements java.io.Serializable{
+private static final long serialVersionUID = 5454155825314635342L;
+
+
+/**
+ * id       db_column: ID
+ */
+private Long id;
+/**
+ * code       db_column: CODE
+ */
+private Object code;
+/**
+ * label       db_column: LABEL
+ */
+private Object label;
+//columns END
+
+}

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

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

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

@@ -0,0 +1,42 @@
+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_PROVINCE")
+@KeySequence(value="SEQ_BUS",clazz=Long.class)
+public class MetaProvince extends Model<MetaProvince>  implements Serializable{
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * id       db_column: ID
+     */
+    @TableId(value="ID", type= IdType.INPUT)
+    private Long id;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    /**
+     * code       db_column: CODE
+     */
+    @TableField("CODE")
+    private Object code;
+
+    /**
+     * label       db_column: LABEL
+     */
+    @TableField("LABEL")
+    private Object label;
+//columns END
+
+}

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

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

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

@@ -0,0 +1,21 @@
+
+package io.platform.sys.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import io.platform.sys.biz.mapper.MetaProvinceMapper;
+import io.platform.sys.biz.entity.MetaProvince;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("metaProvinceService")
+public class MetaProvinceService extends ServiceImpl<MetaProvinceMapper,MetaProvince>{
+
+    public List<MetaProvince> 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/MetaProvinceServiceClientImpl.java

@@ -0,0 +1,145 @@
+
+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.MetaProvince;
+import io.platform.sys.biz.service.MetaProvinceService;
+import io.platform.sys.dto.MetaProvinceDto;
+import io.platform.sys.service.client.api.MetaProvinceServiceClient;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Component
+@Service()
+public class MetaProvinceServiceClientImpl extends BaseServiceClient<MetaProvince,MetaProvinceDto> implements MetaProvinceServiceClient {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private MetaProvinceService metaProvinceService;
+
+    @Override
+    public MetaProvinceDto queryObject(Long id) {
+        MetaProvince metaProvince = metaProvinceService.getById(id);
+        MetaProvinceDto metaProvinceDto = new MetaProvinceDto();
+        BeanUtils.copyProperties(metaProvince,metaProvinceDto);
+        return metaProvinceDto;
+    }
+
+    @Override
+    public List<MetaProvinceDto> queryList(Map<String, Object> map) {
+        List<MetaProvince> metaProvinceList = metaProvinceService.selectByMap(map);
+        return convertList(metaProvinceList,MetaProvinceDto.class);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        QueryWrapper<MetaProvince> ew = new QueryWrapper<>();
+        ew.allEq(map);
+        return metaProvinceService.count(ew);
+    }
+
+    @Override
+    public ExecuteResult<String> save(MetaProvinceDto metaProvinceDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            MetaProvince metaProvince = new MetaProvince();
+            revert(metaProvinceDto,metaProvince);
+            boolean flag = metaProvinceService.save(metaProvince);
+            if(!flag){
+                result.addErrorMessage("保存失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 保存错误：" + e.toString(), e);
+            result.addErrorMessage("保存错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> update(MetaProvinceDto metaProvinceDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            MetaProvince metaProvince = new MetaProvince();
+            revert(metaProvinceDto,metaProvince);
+            boolean flag = metaProvinceService.updateById(metaProvince);
+            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 = metaProvinceService.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 = metaProvinceService.removeByIds(ids);
+            if(!flag){
+                result.addErrorMessage("批量删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public Page<MetaProvinceDto> getPage(Page<MetaProvinceDto> pageDto,MetaProvinceDto metaProvinceDto) {
+        Page<MetaProvince> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
+
+        page.setAsc(pageDto.ascs());
+        page.setDesc(pageDto.descs());
+        page.condition().putAll(pageDto.condition());
+
+        MetaProvince metaProvince = new MetaProvince();
+        revert(metaProvinceDto,metaProvince);
+
+        QueryWrapper<MetaProvince> wrapper = new QueryWrapper<>();
+        wrapper.setEntity(metaProvince);
+
+        List<MetaProvinceDto> metaProvinceDtoList = convertList(metaProvinceService.page(page,wrapper).getRecords(),MetaProvinceDto.class);
+        pageDto.setTotal(metaProvinceService.count(wrapper));
+        pageDto.setRecords(metaProvinceDtoList);
+        return pageDto;
+    }
+}

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