diff --git a/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java rename to mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java index d2c7a5d12..1d7c7c3b5 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java @@ -19,7 +19,7 @@ import com.simple.service.MallPermissionService; */ @RestController @RequestMapping("permission") -public class SysPermissionController { +public class MallPermissionController { @Autowired MallPermissionService mallPermissionService; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java similarity index 93% rename from mallinkAdmin/src/main/java/com/simple/controller/RoleController.java rename to mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index 5b537c7e7..b67898602 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -1,78 +1,78 @@ -package com.simple.controller; - -import com.simple.domain.po.MallRole; -import com.simple.service.MallRoleService; -import com.simple.service.MallRolePermissionService; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; - - -@RestController -@RequestMapping("role") -@Api(description="角色相关接口") -public class RoleController { - - @Autowired - private MallRoleService sysRoleService; - - @Autowired - private MallRolePermissionService SysRolePermissionService; - - private Logger logger = Logger.getLogger(RoleController.class); - - @GetMapping("list") - public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { - final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(MallRole sysRole) { - Assert.notNull(sysRole.getName(), "角色名不能为空"); - Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - sysRoleService.saveOrUpdate(sysRole); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(MallRole sysRole) { - if (sysRole.getName() != null) { - System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); - Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在"); - } - sysRoleService.saveOrUpdate(sysRole); -// Assert.notNull(sysRole.getName(), "角色名不能为空"); - return new ResultData(); - } - - @GetMapping("/del") - public ResultData delete(Long id) { - sysRoleService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("setPermission") - public ResultData setPermission(Long roleId, String perId) { - Assert.notNull(perId,"请选择权限"); - /*String[] perIds = perId.split(","); - SysRolePermissionService.savePermissions(roleId, perIds);*/ - //TODO - return new ResultData(Result.SUCCESS, "设置角色权限成功", null); - - } - - private boolean checkUnique(String name, Long id) { - return sysRoleService.countByName(name, id) > 0 ? true : false; - } - -} +package com.simple.controller; + +import com.simple.domain.po.MallRole; +import com.simple.service.MallRoleService; +import com.simple.service.MallRolePermissionService; +import io.swagger.annotations.Api; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + + +@RestController +@RequestMapping("role") +@Api(description="角色相关接口") +public class MallRoleController { + + @Autowired + private MallRoleService sysRoleService; + + @Autowired + private MallRolePermissionService SysRolePermissionService; + + private Logger logger = Logger.getLogger(MallRoleController.class); + + @GetMapping("list") + public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { + final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(MallRole sysRole) { + Assert.notNull(sysRole.getName(), "角色名不能为空"); + Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + sysRoleService.saveOrUpdate(sysRole); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(MallRole sysRole) { + if (sysRole.getName() != null) { + System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); + Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在"); + } + sysRoleService.saveOrUpdate(sysRole); +// Assert.notNull(sysRole.getName(), "角色名不能为空"); + return new ResultData(); + } + + @GetMapping("/del") + public ResultData delete(Long id) { + sysRoleService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("setPermission") + public ResultData setPermission(Long roleId, String perId) { + Assert.notNull(perId,"请选择权限"); + /*String[] perIds = perId.split(","); + SysRolePermissionService.savePermissions(roleId, perIds);*/ + //TODO + return new ResultData(Result.SUCCESS, "设置角色权限成功", null); + + } + + private boolean checkUnique(String name, Long id) { + return sysRoleService.countByName(name, id) > 0 ? true : false; + } + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java rename to mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 0a19d1276..0b21784fe 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "API - UserInfoController", description = "用户接口") @RestController @RequestMapping("user") -public class UserInfoController { +public class MallUserInfoController { @Autowired MallUserInfoService userInfoService; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index 134ec6c7c..daf2dd842 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -68,9 +68,18 @@ public class WxShop implements Serializable { /*店铺相对位置y**/ @io.swagger.annotations.ApiModelProperty(value="店铺相对位置y",name="y") private BigDecimal y; - /*百度poi**/ - @io.swagger.annotations.ApiModelProperty(value="百度poi",name="baiduPoi") + /*地址**/ + @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") + private String addr; + /*百度poi(省市区县street等)**/ + @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") private String baiduPoi; + /*经度- baidu poi**/ + @io.swagger.annotations.ApiModelProperty(value="经度- baidu poi",name="longitude") + private BigDecimal longitude; + /*维度-baidu poi**/ + @io.swagger.annotations.ApiModelProperty(value="维度-baidu poi",name="latitude") + private BigDecimal latitude; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -131,12 +140,30 @@ public class WxShop implements Serializable { public void setY(BigDecimal _y) { y = _y; } + public String getAddr() { + return addr; + } + public void setAddr(String _addr) { + addr = _addr; + } public String getBaiduPoi() { return baiduPoi; } public void setBaiduPoi(String _baiduPoi) { baiduPoi = _baiduPoi; } + public BigDecimal getLongitude() { + return longitude; + } + public void setLongitude(BigDecimal _longitude) { + longitude = _longitude; + } + public BigDecimal getLatitude() { + return latitude; + } + public void setLatitude(BigDecimal _latitude) { + latitude = _latitude; + } public Date getCreateDate() { return createDate; } @@ -164,7 +191,10 @@ public class WxShop implements Serializable { ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,X_ASC("`x` ASC"),X_DESC("`x` DESC") ,Y_ASC("`y` ASC"),Y_DESC("`y` DESC") + ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") ,BaiduPoi_ASC("`baiduPoi` ASC"),BaiduPoi_DESC("`baiduPoi` DESC") + ,Longitude_ASC("`longitude` ASC"),Longitude_DESC("`longitude` DESC") + ,Latitude_ASC("`latitude` ASC"),Latitude_DESC("`latitude` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java index 6caf3b1a9..6bf23751c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java @@ -32,7 +32,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { public void saveOrUpdate(MallPermission record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - + record.setId(new IdWorker(0, 0).nextId()); mallPermissionMapper.insertSelective(record); } else { mallPermissionMapper.updateByPrimaryKeySelective(record); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 987856032..6675742eb 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -12,13 +12,16 @@ + + + - `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`baidu_poi`,`create_date`,`update_date` + `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date` @@ -74,11 +77,26 @@ + + and `addr` like concat('%', #{addr},'%') + + + and `baidu_poi` like concat('%', #{baiduPoi},'%') + + and `longitude` = #{longitude} + + + + + and `latitude` = #{latitude} + + + and `create_date` = #{createDate}