diff --git a/cloud-common-plugin-map/pom.xml b/cloud-common-plugin-map/pom.xml index b2c2a4f..5b50222 100644 --- a/cloud-common-plugin-map/pom.xml +++ b/cloud-common-plugin-map/pom.xml @@ -12,6 +12,18 @@ 地图插件，画网格 1.0.1-SNAPSHOT - + + + com.cm + cloud-common + 1.0.1-SNAPSHOT + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + + + + \ No newline at end of file diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/dao/IGridDao.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/dao/IGridDao.java new file mode 100644 index 0000000..2d8431b --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/dao/IGridDao.java @@ -0,0 +1,118 @@ +package com.cm.plugin.map.dao; + +import com.cm.common.exception.RemoveException; +import com.cm.common.exception.SaveException; +import com.cm.common.exception.SearchException; +import com.cm.plugin.map.pojo.dto.GridDTO; +import com.cm.plugin.map.pojo.dto.GridPointDTO; +import com.cm.plugin.map.pojo.dto.GridRelationDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IGridDao + * @Description: 网格业务 + * @Author: WangGeng + * @Date: 2020/10/21 11:16 + * @Version: 1.0 + **/ +@Repository +public interface IGridDao { + /** + * 保存网格 + * + * @param params + * @throws SaveException + */ + void saveGrid(Map params) throws SaveException; + + /** + * 保存网格关联关系 + * + * @param params + * @throws SaveException + */ + void saveGridRelation(Map params) throws SaveException; + + /** + * 保存网格点 + * + * @param params + * @throws SaveException + */ + void saveGridPoint(Map params) throws SaveException; + + /** + * 删除网格 + * + * @param params + * @throws RemoveException + */ + void deleteGrid(Map params) throws RemoveException; + + /** + * 删除网格点 + * + * @param params + * @throws RemoveException + */ + void deleteGridPoint(Map params) throws RemoveException; + + /** + * 删除网格关联关系 + * + * @param params + * @throws RemoveException + */ + void deleteGridRelation(Map params) throws RemoveException; + + /** + * 获取关联关系列表 + * + * @param params + * @return + * @throws SearchException + */ + List listGridRelation(Map params) throws SearchException; + + /** + * 获取网格列表 + * + * @param relationId 关联ID + * @return + * @throws SearchException + */ + List listGridByRelationId(String relationId) throws SearchException; + + /** + * 获取网格点列表 + * + * @param gridId 网格ID + * @return + * @throws SearchException + */ + List listPointByGridId(String gridId) throws SearchException; + + /** + * 获取网格点列表 + * + * @param relationIds 关联ID列表 + * @return + * @throws SearchException + */ + List listGridByRelationIds(List relationIds) throws SearchException; + + /** + * 获取网格点列表 + * + * @param gridIds 网格ID列表 + * @return + * @throws SearchException + */ + List listPointByGridIds(List gridIds) throws SearchException; +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridDTO.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridDTO.java new file mode 100644 index 0000000..57fba7e --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridDTO.java @@ -0,0 +1,84 @@ +package com.cm.plugin.map.pojo.dto; + +import com.cm.plugin.map.pojo.vo.GridPointVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.List; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: GridDTO + * @Description: 网格 + * @Author: WangGeng + * @Date: 2020/10/21 17:01 + * @Version: 1.0 + **/ +@ApiModel +public class GridDTO extends GridRelationDTO { + + @ApiModelProperty(name = "fillColor", value = "填充颜色") + private String fillColor; + @ApiModelProperty(name = "gridName", value = "网格名称") + private String gridName; + @ApiModelProperty(name = "relationIdArray", value = "关联ID列表") + private List relationIdArray; + @ApiModelProperty(name = "pointArray", value = "网格点列表") + private List pointArray; + + public String getFillColor() { + return fillColor == null ? "" : fillColor.trim(); + } + + public void setFillColor(String fillColor) { + this.fillColor = fillColor; + } + + public String getGridName() { + return gridName == null ? "" : gridName.trim(); + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public List getRelationIdArray() { + if (relationIdArray == null) { + return new ArrayList<>(); + } + return relationIdArray; + } + + public void setRelationIdArray(List relationIdArray) { + this.relationIdArray = relationIdArray; + } + + public List getPointArray() { + if (pointArray == null) { + return new ArrayList<>(); + } + return pointArray; + } + + public void setPointArray(List pointArray) { + this.pointArray = pointArray; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"fillColor\":\"") + .append(fillColor).append('\"'); + sb.append(",\"gridName\":\"") + .append(gridName).append('\"'); + sb.append(",\"relationIdArray\":") + .append(relationIdArray); + sb.append(",\"pointArray\":") + .append(pointArray); + sb.append('}'); + return sb.toString(); + } +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridPointDTO.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridPointDTO.java new file mode 100644 index 0000000..29bb376 --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridPointDTO.java @@ -0,0 +1,62 @@ +package com.cm.plugin.map.pojo.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: BaiduGridPointVO + * @Description: 百度地图网格点 + * @Author: WangGeng + * @Date: 2020/10/21 11:02 + * @Version: 1.0 + **/ +@ApiModel +public class GridPointDTO { + + @ApiModelProperty(name = "gridId", value = "网格ID") + private String gridId; + @ApiModelProperty(name = "lng", value = "经度") + private String lng; + @ApiModelProperty(name = "lat", value = "纬度") + private String lat; + + public String getGridId() { + return gridId == null ? "" : gridId.trim(); + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getLng() { + return lng == null ? "" : lng.trim(); + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat == null ? "" : lat.trim(); + } + + public void setLat(String lat) { + this.lat = lat; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"gridId\":\"") + .append(gridId).append('\"'); + sb.append(",\"lng\":\"") + .append(lng).append('\"'); + sb.append(",\"lat\":\"") + .append(lat).append('\"'); + sb.append('}'); + return sb.toString(); + } +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridRelationDTO.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridRelationDTO.java new file mode 100644 index 0000000..ed31a49 --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/dto/GridRelationDTO.java @@ -0,0 +1,53 @@ +package com.cm.plugin.map.pojo.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: GridRelationDTO + * @Description: 网格关联 + * @Author: WangGeng + * @Date: 2020/10/21 12:11 + * @Version: 1.0 + **/ +@ApiModel +public class GridRelationDTO implements Serializable { + + private static final long serialVersionUID = 9159203095930603288L; + @ApiModelProperty(name = "gridId", value = "网格ID") + private String gridId; + @ApiModelProperty(name = "relationId", value = "关联ID") + private String relationId; + + public String getGridId() { + return gridId == null ? "" : gridId.trim(); + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getRelationId() { + return relationId == null ? "" : relationId.trim(); + } + + public void setRelationId(String relationId) { + this.relationId = relationId; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"gridId\":\"") + .append(gridId).append('\"'); + sb.append(",\"relationId\":\"") + .append(relationId).append('\"'); + sb.append('}'); + return sb.toString(); + } +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridPointVO.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridPointVO.java new file mode 100644 index 0000000..48f7503 --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridPointVO.java @@ -0,0 +1,62 @@ +package com.cm.plugin.map.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: BaiduGridPointVO + * @Description: 百度地图网格点 + * @Author: WangGeng + * @Date: 2020/10/21 11:02 + * @Version: 1.0 + **/ +@ApiModel +public class GridPointVO { + + @ApiModelProperty(name = "gridId", value = "网格ID") + private String gridId; + @ApiModelProperty(name = "lng", value = "经度") + private String lng; + @ApiModelProperty(name = "lat", value = "纬度") + private String lat; + + public String getGridId() { + return gridId == null ? "" : gridId.trim(); + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getLng() { + return lng == null ? "" : lng.trim(); + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat == null ? "" : lat.trim(); + } + + public void setLat(String lat) { + this.lat = lat; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"gridId\":\"") + .append(gridId).append('\"'); + sb.append(",\"lng\":\"") + .append(lng).append('\"'); + sb.append(",\"lat\":\"") + .append(lat).append('\"'); + sb.append('}'); + return sb.toString(); + } +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridVO.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridVO.java new file mode 100644 index 0000000..c969b72 --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/pojo/vo/GridVO.java @@ -0,0 +1,95 @@ +package com.cm.plugin.map.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.List; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: BaiduGridVO + * @Description: 百度地图网格 + * @Author: WangGeng + * @Date: 2020/10/21 11:02 + * @Version: 1.0 + **/ +@ApiModel +public class GridVO { + + @ApiModelProperty(name = "id", value = "网格ID") + private String id; + @ApiModelProperty(name = "fillColor", value = "填充颜色") + private String fillColor; + @ApiModelProperty(name = "gridName", value = "网格名称") + private String gridName; + @ApiModelProperty(name = "relationIdArray", value = "关联ID列表") + private List relationIdArray; + @ApiModelProperty(name = "pointArray", value = "网格点列表") + private List pointArray; + + public String getId() { + return id == null ? "" : id.trim(); + } + + public void setId(String id) { + this.id = id; + } + + public String getFillColor() { + return fillColor == null ? "" : fillColor.trim(); + } + + public void setFillColor(String fillColor) { + this.fillColor = fillColor; + } + + public String getGridName() { + return gridName == null ? "" : gridName.trim(); + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public List getRelationIdArray() { + if (relationIdArray == null) { + return new ArrayList<>(); + } + return relationIdArray; + } + + public void setRelationIdArray(List relationIdArray) { + this.relationIdArray = relationIdArray; + } + + public List getPointArray() { + if (pointArray == null) { + return new ArrayList<>(); + } + return pointArray; + } + + public void setPointArray(List pointArray) { + this.pointArray = pointArray; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"id\":\"") + .append(id).append('\"'); + sb.append(",\"fillColor\":\"") + .append(fillColor).append('\"'); + sb.append(",\"gridName\":\"") + .append(gridName).append('\"'); + sb.append(",\"relationIdArray\":") + .append(relationIdArray); + sb.append(",\"pointArray\":") + .append(pointArray); + sb.append('}'); + return sb.toString(); + } +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/IGridService.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/IGridService.java new file mode 100644 index 0000000..90c96bd --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/IGridService.java @@ -0,0 +1,113 @@ +package com.cm.plugin.map.service; + +import com.cm.common.exception.RemoveException; +import com.cm.common.exception.SearchException; +import com.cm.plugin.map.pojo.dto.GridDTO; +import com.cm.plugin.map.pojo.dto.GridRelationDTO; +import com.cm.plugin.map.pojo.vo.GridPointVO; +import com.cm.plugin.map.pojo.vo.GridVO; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IGridService + * @Description: 网格业务 + * @Author: WangGeng + * @Date: 2020/10/21 11:14 + * @Version: 1.0 + **/ +public interface IGridService { + + /** + * 保存网格并返回ID + * + * @param gridVO + * @return + * @throws Exception + */ + void saveGrid(GridVO gridVO) throws Exception; + + /** + * 更新网格数组 + * + * @param gridId 网格ID + * @param pointArray 点数组 + * @throws Exception + */ + void updateGridPointArrayByGridId(String gridId, List pointArray) throws Exception; + + /** + * 删除网格 + * + * @param relationId 关联关系 + * @throws RemoveException + */ + void deleteGridByRelationId(String relationId) throws RemoveException; + + /** + * 删除网格 + * + * @param gridIds 网格ID列表 + * @throws SearchException + */ + void deleteGridByGridIds(List gridIds) throws RemoveException; + + /** + * 获取网格关系列表 + * + * @param relationId 关联ID + * @return + * @throws SearchException + */ + List listGridRelationByRelationId(String relationId) throws SearchException; + + /** + * 获取网格关系列表 + * + * @param relationIds 关联ID列表 + * @return + * @throws SearchException + */ + List listGridRelationByRelationIds(List relationIds) throws SearchException; + + /** + * 获取网格关系列表 + * + * @param gridId 网格ID + * @return + * @throws SearchException + */ + List listGridRelationByGridId(String gridId) throws SearchException; + + /** + * 获取网格关系列表 + * + * @param gridIds 网格ID列表 + * @return + * @throws SearchException + */ + List listGridRelationByGridIds(List gridIds) throws SearchException; + + /** + * 获取网格列表 + * + * @param relationId 关联ID + * @return + * @throws SearchException + */ + List listGridByRelationId(String relationId) throws SearchException; + + /** + * 获取网格列表 + * + * @param relationIds 关联ID列表 + * @return + * @throws SearchException + */ + List listGridByRelationIds(List relationIds) throws SearchException; + +} diff --git a/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/impl/GridServiceImpl.java b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/impl/GridServiceImpl.java new file mode 100644 index 0000000..08d2ac3 --- /dev/null +++ b/cloud-common-plugin-map/src/main/java/com/cm/plugin/map/service/impl/GridServiceImpl.java @@ -0,0 +1,216 @@ +package com.cm.plugin.map.service.impl; + +import com.alibaba.druid.util.StringUtils; +import com.cm.common.base.AbstractService; +import com.cm.common.exception.RemoveException; +import com.cm.common.exception.SearchException; +import com.cm.common.utils.HashMapUtil; +import com.cm.common.utils.UUIDUtil; +import com.cm.plugin.map.dao.IGridDao; +import com.cm.plugin.map.pojo.dto.GridDTO; +import com.cm.plugin.map.pojo.dto.GridPointDTO; +import com.cm.plugin.map.pojo.dto.GridRelationDTO; +import com.cm.plugin.map.pojo.vo.GridPointVO; +import com.cm.plugin.map.pojo.vo.GridVO; +import com.cm.plugin.map.service.IGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: GridServiceImpl + * @Description: 网格业务 + * @Author: WangGeng + * @Date: 2020/10/21 11:14 + * @Version: 1.0 + **/ +@Service +public class GridServiceImpl extends AbstractService implements IGridService { + + @Autowired + private IGridDao gridDao; + + @Override + public void saveGrid(GridVO gridVO) throws Exception { + String gridId = UUIDUtil.getUUID(); + List relationIdArray = gridVO.getRelationIdArray(); + List pointArray = gridVO.getPointArray(); + // 保存网格 + Map params = HashMapUtil.beanToMap(gridVO); + params.put("gridId", gridId); + params.remove("relationIdArray"); + params.remove("pointArray"); + setSaveInfo(params); + gridDao.saveGrid(params); + // 保存拓展属性 + saveRelationIdArray(gridId, relationIdArray); + savePointArray(gridId, pointArray); + } + + @Override + public void updateGridPointArrayByGridId(String gridId, List pointArray) throws Exception { + // 删除原有网格数组 + Map params = getHashMap(2); + params.put("gridId", gridId); + gridDao.deleteGridPoint(params); + // 新增网格数组 + for (GridPointVO gridPointVO : pointArray) { + params = HashMapUtil.beanToMap(gridPointVO); + params.put("gridId", gridId); + gridDao.saveGridPoint(params); + } + } + + @Override + public void deleteGridByRelationId(String relationId) throws RemoveException { + List gridRelationDTOs = listGridRelationByRelationId(relationId); + if (gridRelationDTOs.isEmpty()) { + return; + } + List gridIds = new ArrayList<>(); + for (GridRelationDTO gridRelationDTO : gridRelationDTOs) { + gridIds.add(gridRelationDTO.getGridId()); + } + Map params = getHashMap(2); + params.put("gridIds", gridIds); + // 删除网格 + gridDao.deleteGrid(params); + // 删除网格点 + gridDao.deleteGridPoint(params); + // 删除关联关系 + params.clear(); + params.put("relationId", relationId); + gridDao.deleteGridRelation(params); + } + + @Override + public void deleteGridByGridIds(List gridIds) throws RemoveException { + if (gridIds.isEmpty()) { + return; + } + // 删除网格 + Map params = getHashMap(2); + params.put("gridIds", gridIds); + gridDao.deleteGrid(params); + // 删除点数组 + gridDao.deleteGridPoint(params); + // 删除关联 + gridDao.deleteGridRelation(params); + } + + @Override + public List listGridRelationByRelationId(String relationId) throws SearchException { + Map params = getHashMap(2); + params.put("relationId", relationId); + return gridDao.listGridRelation(params); + } + + @Override + public List listGridRelationByRelationIds(List relationIds) throws SearchException { + Map params = getHashMap(2); + params.put("relationIds", relationIds); + return gridDao.listGridRelation(params); + } + + @Override + public List listGridRelationByGridId(String gridId) throws SearchException { + Map params = getHashMap(2); + params.put("gridId", gridId); + return gridDao.listGridRelation(params); + } + + @Override + public List listGridRelationByGridIds(List gridIds) throws SearchException { + Map params = getHashMap(2); + params.put("gridIds", gridIds); + return gridDao.listGridRelation(params); + } + + @Override + public List listGridByRelationId(String relationId) throws SearchException { + List gridDTOs = gridDao.listGridByRelationId(relationId); + if (gridDTOs.isEmpty()) { + return gridDTOs; + } + for (GridDTO gridDTO : gridDTOs) { + List gridPointDTOs = gridDao.listPointByGridId(gridDTO.getGridId()); + gridDTO.setPointArray(gridPointDTOs); + } + return gridDTOs; + } + + @Override + public List listGridByRelationIds(List relationIds) throws SearchException { + if (relationIds == null || relationIds.size() == 0) { + return new ArrayList<>(); + } + List gridDTOs = gridDao.listGridByRelationIds(relationIds); + if (gridDTOs.isEmpty()) { + return gridDTOs; + } + List gridIds = new ArrayList<>(); + for (GridDTO gridDTO : gridDTOs) { + gridIds.add(gridDTO.getGridId()); + } + // 获取所有点 + List gridPointDTOs = gridDao.listPointByGridIds(gridIds); + if (gridPointDTOs.isEmpty()) { + return gridDTOs; + } + // 构建所有点 + for (GridDTO gridDTO : gridDTOs) { + List pointArray = new ArrayList<>(); + for (GridPointDTO gridPointDTO : gridPointDTOs) { + if (StringUtils.equals(gridDTO.getGridId(), gridPointDTO.getGridId())) { + pointArray.add(gridPointDTO); + } + } + gridDTO.setPointArray(pointArray); + } + return gridDTOs; + } + + /** + * 保存关联关系 + * + * @param gridId + * @param relationIdArray + */ + private void saveRelationIdArray(String gridId, List relationIdArray) { + if (relationIdArray == null || relationIdArray.isEmpty()) { + return; + } + Map params = getHashMap(4); + params.put("gridId", gridId); + for (String relationId : relationIdArray) { + params.put("relationId", relationId); + gridDao.saveGridRelation(params); + } + } + + /** + * 保存网格点 + * + * @param gridId + * @param pointArray + */ + private void savePointArray(String gridId, List pointArray) { + if (pointArray == null || pointArray.isEmpty()) { + return; + } + Map params = getHashMap(4); + params.put("gridId", gridId); + for (GridPointVO gridPointVO : pointArray) { + params.put("lng", gridPointVO.getLng()); + params.put("lat", gridPointVO.getLat()); + gridDao.saveGridPoint(params); + } + } + +} diff --git a/cloud-common-plugin-map/src/main/resources/mybatis/mapper/grid-mapper.xml b/cloud-common-plugin-map/src/main/resources/mybatis/mapper/grid-mapper.xml new file mode 100644 index 0000000..9377481 --- /dev/null +++ b/cloud-common-plugin-map/src/main/resources/mybatis/mapper/grid-mapper.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO map_grid( + grid_id, + grid_name, + fill_color, + gmt_create, + creator, + gmt_modified, + modifier, + is_delete + ) VALUES( + #{gridId}, + #{gridName}, + #{fillColor}, + #{gmtCreate}, + #{creator}, + #{gmtModified}, + #{modifier}, + #{isDelete} + ) + + + + + INSERT INTO map_grid_relation( + grid_id, + relation_id + ) VALUES( + #{gridId}, + #{relationId} + ) + + + + + DELETE FROM + map_grid + WHERE + + grid_id = #{gridId} + + + grid_id IN + + #{gridIds[${index}]} + + + + + + + DELETE FROM + map_grid_point + WHERE + + grid_id = #{gridId} + + + grid_id IN + + #{gridIds[${index}]} + + + + + + + DELETE FROM + map_grid_relation + WHERE + + grid_id = #{gridId} + + + grid_id IN + + #{gridIds[${index}]} + + + + relation_id = #{relationId} + + + + + + INSERT INTO map_grid_point( + grid_id, + lng, + lat + ) VALUES( + #{gridId}, + #{lng}, + #{lat} + ) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cloud-common-plugin-map/src/main/resources/templates/baidu/update-grid.html b/cloud-common-plugin-map/src/main/resources/templates/baidu/update-grid.html new file mode 100644 index 0000000..c2bfcb5 --- /dev/null +++ b/cloud-common-plugin-map/src/main/resources/templates/baidu/update-grid.html @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/IApiConsts.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/IApiConsts.java index b82c6e4..71e4917 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/IApiConsts.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/IApiConsts.java @@ -182,5 +182,18 @@ public interface IApiConsts { * 获取所在部门用户列表（通过职位ID列表） */ String LIST_USER_DEPARTMENT_RESOURCE_BY_POSITION_IDS = "%s/resource/user/listuserdepartmentresourcebypositionids"; + /** + * 组织部门人员分页列表 + */ + String LIST_SELECT_DEPARTMENT_USER = "%s/resource/user/listselectdepartmentuser/%s"; + /** + * 通过id列表获取用户ID + */ + String LIST_PAGE_SELECT_DEPARTMENT_USER = "%s/resource/user/listpageselectdepartmentuser/%s"; + + /** + * 发送钉钉消息通过电话列表 + */ + String SEND_DINGDING_MSG_BY_PHONES = "%s/resource/dingdingmessage/sendbyphones"; } diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/apis/user/UserController.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/apis/user/UserController.java index 0e21b82..177dc76 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/apis/user/UserController.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/apis/user/UserController.java @@ -11,13 +11,16 @@ import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; import com.cm.common.plugin.oauth.service.user.IUserService; import com.cm.common.plugin.pojo.bos.UserResourceBO; +import com.cm.common.pojo.ListPage; import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -87,18 +90,6 @@ public class UserController extends AbstractController { return userService.listPositionUsers(params); } - @ApiOperation(value = "通过用户ID获取用户列表", notes = "通过用户ID获取用户列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userIds", value = "用不ID列表", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listuserbyids/{userIds}") - public JSONArray listUserByIds(@PathVariable("userIds") String userIds) throws AccessTokenException, SearchException { - Map params = getParams(); - params.put("userIds", userIds); - return userService.listUserByIds(params); - } - @ApiOperation(value = "全部用户列表", notes = "全部用户列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listallusers") @@ -189,4 +180,47 @@ public class UserController extends AbstractController { return userService.listPageUserSimple(params); } + @ApiOperation(value = "组织部门人员列表", notes = "组织部门人员列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listselectdepartmentuser/{departmentId}") + public JSONArray listSelectDepartmentUser(@PathVariable("departmentId") String departmentId) throws SearchException { + return userService.listSelectDepartmentUser(departmentId); + } + + @ApiOperation(value = "组织部门人员分页列表", notes = "组织部门人员分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpageselectdepartmentuser/{departmentId}") + public JSONObject listPageSelectDepartmentUser(@PathVariable("departmentId") String departmentId, ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return userService.listPageSelectDepartmentUserByDepartmentId(departmentId, page); + } + + @ApiOperation(value = "通过ID列表获取用户列表", notes = "通过ID列表获取用户列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userIds", value = "用户ID列表，用下划线分隔，如：1_2_3", paramType = "body") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("listuserbyids") + public JSONArray listUserByIds(@RequestBody Map params) throws SearchException, ParamsException { + if (params.get("selectedUserIds") == null || StringUtils.isBlank(params.get("selectedUserIds").toString())) { + throw new ParamsException("用户列表不能为空"); + } + params.put("userIds", params.get("selectedUserIds")); + params.remove("selectedUserIds"); + return userService.listUserByIds(params); + } + } \ No newline at end of file diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/routes/RouteController.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/routes/RouteController.java index 805b585..1688c2c 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/routes/RouteController.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/controller/routes/RouteController.java @@ -5,6 +5,7 @@ import com.cm.common.config.properties.OauthProperties; import com.cm.common.config.properties.SystemProperties; import com.cm.common.exception.SearchException; import com.cm.common.pojo.bos.UserInfoBO; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -37,7 +38,12 @@ public class RouteController { ModelAndView mv = new ModelAndView("index"); UserInfoBO userInfoBO = securityComponent.getCurrentUser(); mv.addObject("userUsername", userInfoBO.getUserUsername()); - mv.addObject("oauthServer", oauthProperties.getOauthServer()); + // 门户URL不存在，跳转统一用户 + if (StringUtils.isBlank(systemProperties.getPortalUrl())) { + mv.addObject("oauthServer", oauthProperties.getOauthServer()); + } else { + mv.addObject("oauthServer", systemProperties.getPortalUrl()); + } mv.addObject("title", systemProperties.getTitle()); return mv; } diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/IUserService.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/IUserService.java index 46b446d..fb8488c 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/IUserService.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/IUserService.java @@ -6,6 +6,7 @@ import com.cm.common.exception.AccessTokenException; import com.cm.common.exception.SearchException; import com.cm.common.plugin.pojo.bos.UserResourceBO; import com.cm.common.plugin.pojo.bos.user.UserDepartmentResourceBO; +import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; import org.aspectj.lang.annotation.DeclareError; @@ -68,17 +69,6 @@ public interface IUserService { @Deprecated JSONArray listPositionUsers(Map params) throws AccessTokenException, SearchException; - /** - * 通过id列表获取用户ID - * - * @param params - * @return - * @throws AccessTokenException - * @throws SearchException - */ - @Deprecated - JSONArray listUserByIds(Map params) throws AccessTokenException, SearchException; - /** * 全部用户 * @@ -331,4 +321,32 @@ public interface IUserService { */ List listUserDepartmentResourceByPositionIds(List positionIds) throws SearchException; + /** + * 获取选择的部门用户（插件用） + * + * @param params + * @return + * @throws SearchException + */ + JSONArray listSelectDepartmentUser(String departmentId) throws AccessTokenException, SearchException; + + /** + * 组织部门人员分页列表（插件用） + * + * @param departmentId + * @param page + * @return + * @throws SearchException + */ + JSONObject listPageSelectDepartmentUserByDepartmentId(String departmentId, ListPage page) throws AccessTokenException, SearchException; + + /** + * 通过id列表获取用户ID（插件用） + * + * @param params + * @return + * @throws AccessTokenException + * @throws SearchException + */ + JSONArray listUserByIds(Map params) throws AccessTokenException, SearchException; } diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/impl/UserServiceImpl.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/impl/UserServiceImpl.java index 80af27c..ff149db 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/impl/UserServiceImpl.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/service/user/impl/UserServiceImpl.java @@ -13,6 +13,7 @@ import com.cm.common.plugin.oauth.token.ClientTokenManager; import com.cm.common.plugin.pojo.bos.UserResourceBO; import com.cm.common.plugin.pojo.bos.user.UserDepartmentResourceBO; import com.cm.common.plugin.utils.RestTemplateUtil; +import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; import org.apache.commons.lang3.StringUtils; @@ -71,13 +72,6 @@ public class UserServiceImpl extends AbstractService implements IUserService { return JSONArray.parseArray(result); } - @Override - public JSONArray listUserByIds(Map params) throws AccessTokenException, SearchException { - String result = restTemplateUtil.doPostForm(String.format(IApiConsts.LIST_USER_BY_ID, apiPathProperties.getUserCenter()), params); - searchResourceResult(result, "获取人员列表失败"); - return JSONArray.parseArray(result); - } - @Override public JSONArray listAllUsers(Map params) throws AccessTokenException, SearchException { String result = restTemplateUtil.doPostForm(String.format(IApiConsts.LIST_ALL_USER, apiPathProperties.getUserCenter()), params); @@ -380,4 +374,29 @@ public class UserServiceImpl extends AbstractService implements IUserService { searchResourceResult(result, "获取人员信息失败"); return JSONArray.parseArray(result, UserDepartmentResourceBO.class); } + + @Override + public JSONArray listSelectDepartmentUser(String departmentId) throws SearchException { + Map params = getHashMap(2); + params.put(IApiConsts.ACCESS_TOKEN, ClientTokenManager.getInstance().getClientToken().getAccessToken()); + String result = restTemplateUtil.doGetFormNormal(String.format(IApiConsts.LIST_SELECT_DEPARTMENT_USER, apiPathProperties.getUserCenter(), departmentId), params); + searchResourceResult(result, "获取组织部门人员列表失败"); + return JSONArray.parseArray(result); + } + + @Override + public JSONObject listPageSelectDepartmentUserByDepartmentId(String departmentId, ListPage page) throws SearchException { + page.getParams().put(IApiConsts.ACCESS_TOKEN, ClientTokenManager.getInstance().getClientToken().getAccessToken()); + String result = restTemplateUtil.doGetFormNormal(String.format(IApiConsts.LIST_PAGE_SELECT_DEPARTMENT_USER, apiPathProperties.getUserCenter(), departmentId), page.getParams()); + searchResourceResult(result, "获取组织部门人员分页列表失败"); + return JSONObject.parseObject(result); + } + + @Override + public JSONArray listUserByIds(Map params) throws AccessTokenException, SearchException { + params.put(IApiConsts.ACCESS_TOKEN, ClientTokenManager.getInstance().getClientToken().getAccessToken()); + String result = restTemplateUtil.doPostFormNormal(String.format(IApiConsts.LIST_USER_BY_ID, apiPathProperties.getUserCenter()), params); + searchResourceResult(result, "获取人员列表失败"); + return JSONArray.parseArray(result); + } } diff --git a/cloud-common-plugin-oauth/src/main/resources/templates/user/select-department-user.html b/cloud-common-plugin-oauth/src/main/resources/templates/user/select-department-user.html index eaedeee..9b77e11 100644 --- a/cloud-common-plugin-oauth/src/main/resources/templates/user/select-department-user.html +++ b/cloud-common-plugin-oauth/src/main/resources/templates/user/select-department-user.html @@ -1,193 +1,337 @@ - - - - - - - - - - - - - - -
-
-
-
-
-
-
    + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    -
    -
    -
    - +
    +
    +
    +
      +
      +
      +
      +
      +
      + +
      + + +
      +
      +
      +
      +
      -
      -
      -
      - - +
      +
      +
      + + +
      - - - - - - - + - + } + function listSearchUser(searchUser) { + if(!searchUser) { + return; + } + var loadLayerIndex; + top.restAjax.get(top.restAjax.path('api/user/listselectdepartmentuser/{parentId}', [selectedParentId]), { + keywords: searchUser + }, null, function(code, data) { + addSearchUserDom(data); + }, function(code, data) { + top.dialog.msg(data.msg); + }, function() { + loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); + } + // 初始化人员列表 + function initUsers(parentId) { + selectedParentId = parentId; + $('#userWrapper').empty(); + $('.layui-flow-more').remove(); + initUserFlowLoad(); + } + // 初始化选择的人员 + function initSelectedUsers(callback) { + if(typeof(selectedUserIds) != 'undefined' && selectedUserIds != null && selectedUserIds != '') { + var loadLayerIndex; + top.restAjax.post(top.restAjax.path('api/user/listuserbyids', []), { + selectedUserIds: selectedUserIds + }, null, function(code, data) { + for(var i = 0, item; item = data[i++]; ) { + selectUser(item.userId, item.userName); + selectDepartmentUserOldArray.push({ + userId: item.userId, + userName: item.userName + }); + } + callback(); + }, function(code, data) { + top.dialog.msg(data.msg); + }, function() { + loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); + } else { + callback(); + } + } + initFrame(); + initThree(); + initSelectedUsers(function() { + initUsers(0); + }); + $('#searchUser').on('keyup', function() { + var value = $(this).val(); + if(value) { + $('.layui-flow-more').hide(); + } else { + $('.layui-flow-more').show(); + } + $('.users').hide().filter(":contains('" + value + "')").show(); + $('.search-users').remove(); + if(searchTimeout) { + clearTimeout(searchTimeout); + } + searchTimeout = setTimeout(function() { + listSearchUser(value); + }, 1000); + }); + // 人员是否已经选择 + function isUserSelected(userId) { + var isSelected = false; + for(var i = 0, item; item = selectDepartmentUserArray[i]; i++) { + if(item.userId == userId) { + isSelected = true; + break; + } + } + return isSelected; + } + // 删除已经选择的人员 + function removeSelectedUser(userId) { + for(var i = 0, item; item = selectDepartmentUserArray[i]; i++) { + if(item.userId == userId) { + selectDepartmentUserArray.splice(i, 1); + var selectedUserDom = $('#selected_user_'+ userId); + selectedUserDom.focus(); + selectedUserDom.remove(); + $('#user_'+ userId).removeClass('user-selected'); + break; + } + } + } + // 选择人员 + function selectUser(userId, userName, isOnlySelect) { + if(!isUserSelected(userId)) { + $('#user_'+ userId).addClass('user-selected'); + selectDepartmentUserArray.push({ + userId: userId, + userName: userName + }); + $('#selectUsers').append(''+ userName +' '); + $('#selected_user_'+ userId).focus(); + } else { + if(!isOnlySelect) { + removeSelectedUser(userId); + } + } + } + $(document.body).on('click', '*[lay-click-user]', null, function() { + var data = this.dataset; + selectUser(data.userid, data.username); + }); + $(document.body).on('click', '*[lay-click-removeuser]', null, function() { + var data = this.dataset; + removeSelectedUser(data.userid); + }); + $(document.body).on('click', '*[lay-click-select-all-user]', null, function() { + $('#userWrapper').children().each(function() { + var data = this.dataset; + selectUser(data.userid, data.username, true); + }); + }); + $(document.body).on('click', '*[lay-click-clear-all-user]', null, function() { + $('#userWrapper').children().each(function() { + var data = this.dataset; + removeSelectedUser(data.userid); + }); + }); + $('.close').on('click', function() { + // 关闭按钮返回之前的数据 + top.dialog.dialogData.selectedDepartmentUsers = selectDepartmentUserOldArray; + top.dialog.dialogData.selectedUserIds = null; + closeBox(); + }); + $('.confirm').on('click', function() { + top.dialog.dialogData.selectedDepartmentUsers = selectDepartmentUserArray; + top.dialog.dialogData.selectedUserIds = null; + closeBox(); + }); + }); + + \ No newline at end of file diff --git a/cloud-common-wechat/src/main/java/com/cm/common/wechat/manager/miniapp/WechatMiniAppManager.java b/cloud-common-wechat/src/main/java/com/cm/common/wechat/manager/miniapp/WechatMiniAppManager.java index 531c32a..a905e9b 100644 --- a/cloud-common-wechat/src/main/java/com/cm/common/wechat/manager/miniapp/WechatMiniAppManager.java +++ b/cloud-common-wechat/src/main/java/com/cm/common/wechat/manager/miniapp/WechatMiniAppManager.java @@ -1,9 +1,15 @@ package com.cm.common.wechat.manager.miniapp; import com.cm.common.wechat.config.pojo.WechatMiniAppProperties; +import com.cm.common.wechat.pojo.WechatMiniAppUserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 @@ -17,11 +23,66 @@ import org.slf4j.LoggerFactory; public class WechatMiniAppManager { private static final Logger LOG = LoggerFactory.getLogger(WechatMiniAppManager.class); + private static WechatMiniAppManager wechatMiniAppManager = WechatMiniAppManagerBuilder.wechatMiniAppManager; + // 超时分钟 + private final int TIME_OUT_SECOND = 120 * 60; private WechatMiniAppProperties wechatMiniAppProperties; + private WechatMiniAppManager() { + } + private Map users = new ConcurrentHashMap<>(); + + public static WechatMiniAppManager getInstance() { + return wechatMiniAppManager; + } + + /** + * 添加用户 + * + * @param token + * @param wechatMiniAppUserInfo + */ + public void addUser(String token, WechatMiniAppUserInfo wechatMiniAppUserInfo) { + wechatMiniAppUserInfo.setUpdateTime(System.currentTimeMillis()); + users.put(token, wechatMiniAppUserInfo); + } + + /** + * 获取小程序应用 + * + * @param token + * @return + */ + public WechatMiniAppUserInfo getWechatMiniAppUserInfoByToken(String token) { + return users.get(token); + } + + /** + * 删除超时用户 + */ + public void removeTimeoutUser() { + LOG.debug("delete timeout wechat mini app user start"); + long startTime = System.currentTimeMillis(); + List tokenList = new ArrayList<>(); + for (Map.Entry kv : users.entrySet()) { + // 超时 + if ((startTime - kv.getValue().getUpdateTime()) / 1000 > TIME_OUT_SECOND) { + tokenList.add(kv.getKey()); + } + } + for (String token : tokenList) { + users.remove(token); + } + long endTime = System.currentTimeMillis(); + LOG.debug("delete timeout wechat mini app user end, delete count: {}, useTime: {}ms", tokenList.size(), endTime - startTime); + } public void setWechatMiniAppProperties(WechatMiniAppProperties wechatMiniAppProperties) { this.wechatMiniAppProperties = wechatMiniAppProperties; } + + private static class WechatMiniAppManagerBuilder { + public static final WechatMiniAppManager wechatMiniAppManager = new WechatMiniAppManager(); + } } diff --git a/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfo.java b/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfo.java index f84c42f..4fe6418 100644 --- a/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfo.java +++ b/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfo.java @@ -17,6 +17,7 @@ public class WechatMiniAppUserInfo { private String unionid; private Integer errcode; private String errmsg; + private long updateTime; public String getOpenid() { return openid == null ? "" : openid; @@ -58,6 +59,14 @@ public class WechatMiniAppUserInfo { this.errmsg = errmsg; } + public long getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(long updateTime) { + this.updateTime = updateTime; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); @@ -67,10 +76,12 @@ public class WechatMiniAppUserInfo { .append(session_key).append('\"'); sb.append(",\"unionid\":\"") .append(unionid).append('\"'); - sb.append(",\"errcode\":\"") - .append(errcode).append('\"'); + sb.append(",\"errcode\":") + .append(errcode); sb.append(",\"errmsg\":\"") .append(errmsg).append('\"'); + sb.append(",\"updateTime\":") + .append(updateTime); sb.append('}'); return sb.toString(); } diff --git a/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfoDetail.java b/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfoDetail.java new file mode 100644 index 0000000..5d55f9f --- /dev/null +++ b/cloud-common-wechat/src/main/java/com/cm/common/wechat/pojo/WechatMiniAppUserInfoDetail.java @@ -0,0 +1,187 @@ +package com.cm.common.wechat.pojo; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: WechatMiniAppUserInfoDetail + * @Description: + * @Author: WangGeng + * @Date: 2020/10/29 18:36 + * @Version: 1.0 + **/ +public class WechatMiniAppUserInfoDetail { + + private String openId; + private String nickName; + private Integer gender; + private String city; + private String province; + private String country; + private String avatarUrl; + private String unionId; + private String phoneNumber; + private String purePhoneNumber; + private String countryCode; + private WaterMark watermark; + + public String getOpenId() { + return openId == null ? "" : openId.trim(); + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getNickName() { + return nickName == null ? "" : nickName.trim(); + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public Integer getGender() { + return gender; + } + + public void setGender(Integer gender) { + this.gender = gender; + } + + public String getCity() { + return city == null ? "" : city.trim(); + } + + public void setCity(String city) { + this.city = city; + } + + public String getProvince() { + return province == null ? "" : province.trim(); + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCountry() { + return country == null ? "" : country.trim(); + } + + public void setCountry(String country) { + this.country = country; + } + + public String getAvatarUrl() { + return avatarUrl == null ? "" : avatarUrl.trim(); + } + + public void setAvatarUrl(String avatarUrl) { + this.avatarUrl = avatarUrl; + } + + public String getUnionId() { + return unionId == null ? "" : unionId.trim(); + } + + public void setUnionId(String unionId) { + this.unionId = unionId; + } + + public String getPhoneNumber() { + return phoneNumber == null ? "" : phoneNumber.trim(); + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPurePhoneNumber() { + return purePhoneNumber == null ? "" : purePhoneNumber.trim(); + } + + public void setPurePhoneNumber(String purePhoneNumber) { + this.purePhoneNumber = purePhoneNumber; + } + + public String getCountryCode() { + return countryCode == null ? "" : countryCode.trim(); + } + + public void setCountryCode(String countryCode) { + this.countryCode = countryCode; + } + + public WaterMark getWatermark() { + return watermark; + } + + public void setWatermark(WaterMark watermark) { + this.watermark = watermark; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"openId\":\"") + .append(openId).append('\"'); + sb.append(",\"nickName\":\"") + .append(nickName).append('\"'); + sb.append(",\"gender\":") + .append(gender); + sb.append(",\"city\":\"") + .append(city).append('\"'); + sb.append(",\"province\":\"") + .append(province).append('\"'); + sb.append(",\"country\":\"") + .append(country).append('\"'); + sb.append(",\"avatarUrl\":\"") + .append(avatarUrl).append('\"'); + sb.append(",\"unionId\":\"") + .append(unionId).append('\"'); + sb.append(",\"phoneNumber\":\"") + .append(phoneNumber).append('\"'); + sb.append(",\"purePhoneNumber\":\"") + .append(purePhoneNumber).append('\"'); + sb.append(",\"countryCode\":\"") + .append(countryCode).append('\"'); + sb.append(",\"watermark\":") + .append(watermark); + sb.append('}'); + return sb.toString(); + } + + public static class WaterMark { + private String appid; + private Long timestamp; + + public String getAppid() { + return appid == null ? "" : appid.trim(); + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public Long getTimestamp() { + return timestamp; + } + + public void setTimestamp(Long timestamp) { + this.timestamp = timestamp; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"appid\":\"") + .append(appid).append('\"'); + sb.append(",\"timestamp\":") + .append(timestamp); + sb.append('}'); + return sb.toString(); + } + } + +} diff --git a/cloud-common-wechat/src/main/java/com/cm/common/wechat/service/impl/WechatMiniAppAuthServiceImpl.java b/cloud-common-wechat/src/main/java/com/cm/common/wechat/service/impl/WechatMiniAppAuthServiceImpl.java index 85bf99b..846816d 100644 --- a/cloud-common-wechat/src/main/java/com/cm/common/wechat/service/impl/WechatMiniAppAuthServiceImpl.java +++ b/cloud-common-wechat/src/main/java/com/cm/common/wechat/service/impl/WechatMiniAppAuthServiceImpl.java @@ -8,6 +8,7 @@ import com.cm.common.result.SuccessResultData; import com.cm.common.utils.AesUtil; import com.cm.common.utils.http.RestRequestUtil; import com.cm.common.wechat.config.pojo.WechatMiniAppProperties; +import com.cm.common.wechat.manager.miniapp.WechatMiniAppManager; import com.cm.common.wechat.pojo.WechatMiniAppLoginVO; import com.cm.common.wechat.pojo.WechatMiniAppUserInfo; import com.cm.common.wechat.pojo.WechatOfficialAccountUserInfo; @@ -73,10 +74,14 @@ public class WechatMiniAppAuthServiceImpl implements IWechatMiniAppAuthService { if (wechatMiniAppUserInfo.getErrcode() != null && wechatMiniAppUserInfo.getErrcode() != 0) { throw new WechatAccessTokenForUserException(String.format("获取用户信息失败，错误码：%s，错误信息：%s", wechatMiniAppUserInfo.getErrcode(), wechatMiniAppUserInfo.getErrmsg())); } - LOG.debug("绑定用户 | 登录"); String wechatSignInfo = Base64.encodeBase64String(AesUtil.aesCommonEncoder("WECHAT_SIGN_INFO", new StringBuilder(wechatMiniAppUserInfo.getOpenid()).append("_WenG_").append(wechatMiniAppProperties.getAppKey()).toString()).getBytes("UTF-8")); String token = getAppToken(wechatSignInfo); + if (token.endsWith("_0") || token.endsWith("_1")) { + WechatMiniAppManager.getInstance().addUser(token.substring(0, token.length() - 2), wechatMiniAppUserInfo); + } else { + WechatMiniAppManager.getInstance().addUser(token, wechatMiniAppUserInfo); + } return new SuccessResultData(token); } diff --git a/cloud-common-wechat/src/main/java/com/cm/common/wechat/task/WechatTask.java b/cloud-common-wechat/src/main/java/com/cm/common/wechat/task/WechatTask.java index f32ef79..aedd22a 100644 --- a/cloud-common-wechat/src/main/java/com/cm/common/wechat/task/WechatTask.java +++ b/cloud-common-wechat/src/main/java/com/cm/common/wechat/task/WechatTask.java @@ -1,6 +1,7 @@ package com.cm.common.wechat.task; import com.cm.common.wechat.config.pojo.WechatOfficialAccountProperties; +import com.cm.common.wechat.manager.miniapp.WechatMiniAppManager; import com.cm.common.wechat.manager.officialaccount.WechatOfficialAccountManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,4 +40,12 @@ public class WechatTask { WechatOfficialAccountManager.getInstance().refreshAccessToken(); } + /** + * 删除小程序超时用户，每10分钟执行一次 + */ + @Scheduled(cron = "0 0/10 * * * ?") + public void removeTimeoutMiniAppUser() { + WechatMiniAppManager.getInstance().removeTimeoutUser(); + } + } diff --git a/cloud-common/src/main/java/com/cm/common/config/properties/SystemProperties.java b/cloud-common/src/main/java/com/cm/common/config/properties/SystemProperties.java index 0a70e7c..3d9b85e 100644 --- a/cloud-common/src/main/java/com/cm/common/config/properties/SystemProperties.java +++ b/cloud-common/src/main/java/com/cm/common/config/properties/SystemProperties.java @@ -20,6 +20,7 @@ public class SystemProperties { private Integer port; private String url; private String title; + private String portalUrl; private String loginPageName; public Integer getPort() { @@ -46,6 +47,14 @@ public class SystemProperties { this.title = title; } + public String getPortalUrl() { + return portalUrl == null ? "" : portalUrl.trim(); + } + + public void setPortalUrl(String portalUrl) { + this.portalUrl = portalUrl; + } + public String getLoginPageName() { return loginPageName == null ? "" : loginPageName.trim(); } diff --git a/cloud-common/src/main/java/com/cm/common/utils/AesUtil.java b/cloud-common/src/main/java/com/cm/common/utils/AesUtil.java index 33aa721..bfca12f 100644 --- a/cloud-common/src/main/java/com/cm/common/utils/AesUtil.java +++ b/cloud-common/src/main/java/com/cm/common/utils/AesUtil.java @@ -1,19 +1,25 @@ package com.cm.common.utils; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.StringUtils; import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.io.UnsupportedEncodingException; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; +import java.security.*; public class AesUtil { private static final String IV_STRING = "16-Bytes--String"; + /** + * PKCS#7 + */ + public static final String PKCS_7 = "PKCS7Padding"; + /** + * PKCS#5 + */ + public static final String PKCS_5 = "PKCS5Padding"; /** * AES加密 @@ -84,15 +90,30 @@ public class AesUtil { * @throws Exception */ public static String aesCommonEncoder(String key, String content) throws Exception { + byte[] encryptedBytes = aesCommonEncodeDetail(key, content, IV_STRING.getBytes(), PKCS_5); + return new String(Base64.encodeBase64(encryptedBytes), "UTF-8"); + } + + /** + * 通用aes加密，兼容IOS + * + * @param key + * @param content + * @param paddingType + * @return + * @throws Exception + */ + public static byte[] aesCommonEncodeDetail(String key, String content, byte[] ivBytes, String paddingType) throws Exception { byte[] byteContent = content.getBytes("UTF-8"); byte[] enCodeFormat = key.getBytes(); SecretKeySpec secretKeySpec = new SecretKeySpec(enCodeFormat, "AES"); - byte[] initParam = IV_STRING.getBytes(); - IvParameterSpec ivParameterSpec = new IvParameterSpec(initParam); - Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + IvParameterSpec ivParameterSpec = new IvParameterSpec(ivBytes); + if (StringUtils.equals(paddingType, PKCS_7)) { + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + } + Cipher cipher = Cipher.getInstance("AES/CBC/" + paddingType); cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec); - byte[] encryptedBytes = cipher.doFinal(byteContent); - return new String(Base64.encodeBase64(encryptedBytes), "UTF-8"); + return cipher.doFinal(byteContent); } /** @@ -105,13 +126,30 @@ public class AesUtil { */ public static String aesCommonDecoder(String key, String content) throws Exception { byte[] encryptedBytes = Base64.decodeBase64(content); - byte[] enCodeFormat = key.getBytes(); - SecretKeySpec secretKey = new SecretKeySpec(enCodeFormat, "AES"); - byte[] initParam = IV_STRING.getBytes(); - IvParameterSpec ivParameterSpec = new IvParameterSpec(initParam); - Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); - cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec); - byte[] result = cipher.doFinal(encryptedBytes); + byte[] keyBytes = key.getBytes(); + byte[] result = aesCommonDecoderDetail(keyBytes, encryptedBytes, IV_STRING.getBytes(), PKCS_5); return new String(result, "UTF-8"); } + + /** + * aes cbc 通用解密 + * + * @param keyBytes 秘钥字节数组 + * @param encryptedBytes 密文字节数组 + * @param ivBytes 向量字节数组 + * @param paddingType 填充类型 + * @return + * @throws Exception + */ + public static byte[] aesCommonDecoderDetail(byte[] keyBytes, byte[] encryptedBytes, byte[] ivBytes, String paddingType) throws Exception { + SecretKeySpec secretKey = new SecretKeySpec(keyBytes, "AES"); + IvParameterSpec ivParameterSpec = new IvParameterSpec(ivBytes); + Cipher cipher; + if (StringUtils.equals(paddingType, PKCS_7)) { + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + } + cipher = Cipher.getInstance("AES/CBC/" + paddingType); + cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec); + return cipher.doFinal(encryptedBytes); + } } diff --git a/cloud-manager-sms/pom.xml b/cloud-manager-sms/pom.xml index 290396e..0b9ca5d 100644 --- a/cloud-manager-sms/pom.xml +++ b/cloud-manager-sms/pom.xml @@ -24,6 +24,13 @@ qcloudsms 1.0.6 + + + junit + junit + 4.12 + test + \ No newline at end of file diff --git a/cloud-manager-sms/src/test/java/SmsTest.java b/cloud-manager-sms/src/test/java/SmsTest.java new file mode 100644 index 0000000..6dfbacd --- /dev/null +++ b/cloud-manager-sms/src/test/java/SmsTest.java @@ -0,0 +1,36 @@ +import com.cm.manager.sms.config.properties.SmsDefaultProperties; +import com.cm.manager.sms.utils.DefaultSmsUtil; +import org.junit.Test; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: SmsTest + * @Description: 短信测试 + * @Author: WangGeng + * @Date: 2020/10/20 9:39 + * @Version: 1.0 + **/ +public class SmsTest { + + @Test + public void test() { + // 包头政法 btzfw + // 西藏日喀则 xzrkz + String account = "xzrkz"; + String password = "xzrkz123"; + String phone = "15147146676"; + StringBuilder contentSB = new StringBuilder("【山西腾狮科技】").append("测试短信"); + String url = "https://dx.ipyy.net/sms.aspx?action=send&userid=&account={account}&password={password}&mobile={mobile}&content={content}&sendTime=&extno={extno}"; + String[] paramArray = new String[]{ + account, + password, + phone, + contentSB.toString(), + phone + }; + DefaultSmsUtil.sendSms(url, paramArray); + } + +} diff --git a/pom.xml b/pom.xml index 9f95232..22f7f16 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,7 @@ 5.5.0 1.0.9.RELEASE 4.1.50.Final + 1.46 @@ -431,6 +432,13 @@ ${netty.version} + + + org.bouncycastle + bcprov-jdk15on + 1.56 + + @@ -438,11 +446,11 @@ maven-releases - http://124.67.110.245:8888/repository/maven-releases/ + http://121.36.71.250:8888/repository/maven-releases/ maven-snapshots - http://124.67.110.245:8888/repository/maven-snapshots/ + http://121.36.71.250:8888/repository/maven-snapshots/