Skip to content

Y
yichengstreet-be
Commit d1a86d8e authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev' into dev-lx

parents 40f3f409 d2edaf5b
Show whitespace changes
Inline Side-by-side
Showing with 219 additions and 26 deletions
.gitlab-ci.yml
View file @ d1a86d8e
variables:
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.test.skip=true"
USERNAME: eazytec #hub.eazytec-cloud.com用户名
TOKEN: Eazytec2023 #hub.eazytec-cloud.com的CLI密码
REPO: hub.eazytec-cloud.com #hub.eazytec-cloud.com的地址
NAMESPACE: yichengstreet #项目名
USERNAME: yx-street #hub.eazytec-cloud.com用户名
TOKEN: xUSFbdB95_yVRr #hub.eazytec-cloud.com的CLI密码
REPO: 47.103.57.78:30002 #hub.eazytec-cloud.com的地址
NAMESPACE: yx-street #项目名
IMAGE: yichengstreet-be #项目英文名
OKD: osr.eazytec.intra:8443 #pass平台的地址
OKDUSER: sunf@eazytec.com #pass平台的用户名
......@@ -20,7 +20,7 @@ cache:
stages:
- package
- deploy
- publish
# - publish
package:
......@@ -39,7 +39,7 @@ deploy:
image: hub.eazytec-cloud.com/devops/docker:18
services:
- name: hub.eazytec-cloud.com/devops/docker:18-dind
command: ["--insecure-registry=https://docker-registry-default.app.eazytec.intra", "--registry-mirror=http://bdex97.eazytec.intra:5000"]
command: ["--insecure-registry=47.103.57.78:30002", "--registry-mirror=http://bdex97.eazytec.intra:5000"]
alias: docker
before_script:
- docker info
......@@ -52,14 +52,14 @@ deploy:
only:
- main
publish:
image: hub.eazytec-cloud.com/devops/oc:3.11
before_script:
- oc login -p "${OKDPASS}" -u ${OKDUSER} --insecure-skip-tls-verify ${OKD}
- oc project ${PROJECT}
stage: publish
script:
- if [ $TAG == "master" ]; then TAG="latest"; fi
- oc import-image ${IMAGESTREAM}:${TAG} --from=${REPO}/${NAMESPACE}/${IMAGE}:${TAG} --confirm
only:
- main
\ No newline at end of file
# publish:
# image: hub.eazytec-cloud.com/devops/oc:3.11
# before_script:
# - oc login -p "${OKDPASS}" -u ${OKDUSER} --insecure-skip-tls-verify ${OKD}
# - oc project ${PROJECT}
# stage: publish
# script:
# - if [ $TAG == "master" ]; then TAG="latest"; fi
# - oc import-image ${IMAGESTREAM}:${TAG} --from=${REPO}/${NAMESPACE}/${IMAGE}:${TAG} --confirm
# only:
# - main
\ No newline at end of file
Dockerfile
View file @ d1a86d8e
FROM hub.eazytec-cloud.com/eazytec/openjdk8-fonts:latest
FROM 47.103.57.78:30002/eazytec/openjdk8-fonts:latest
LABEL maintainer="sunf sunf@eazytec.com"
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
View file @ d1a86d8e
......@@ -67,7 +67,11 @@ public class RegionController extends BaseController {
@RequestParam("pageSize") Integer pageSize) {
try {
AjaxResult result = new AjaxResult();
if(wgType.equals("0")){
gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
}else {
gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
}
return JSON.toJSONString(result);
} catch (Exception e) {
e.printStackTrace();
......@@ -787,4 +791,39 @@ public class RegionController extends BaseController {
List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
return AjaxResult.success(gridRegionList);
}
@RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
@ResponseBody
public AjaxResult getTwoThreeRegion(@RequestParam(value = "wgType", required = false) String wgType,
@RequestParam(value = "wgCode", required = false) String wgCode
){
GridRegionExample example1 = new GridRegionExample();
GridRegionExample.Criteria criteria1 = example1.createCriteria();
criteria1.andIsValidEqualTo("1");
criteria1.andWgTypeEqualTo(wgType);
criteria1.andWgParentIdEqualTo(wgCode);
long count = gridRegionMapper.countByExample(example1);
if(count>0){
throw new RuntimeException("当前菜单存在下级菜单，无法删除");
}
GridRegionExample example = new GridRegionExample();
GridRegionExample.Criteria criteria = example.createCriteria();
criteria.andIsValidEqualTo("1");
criteria.andWgTypeEqualTo(wgType);
criteria.andWgCodeEqualTo(wgCode);
return AjaxResult.success(gridRegionMapper.deleteByExample(example));
}
@RequestMapping(value = "/changeName",method = RequestMethod.GET)
@ResponseBody
public AjaxResult changeName(@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "name", required = false) String name
){
return AjaxResult.success(gridRegionMapper.changeTreeNodeName(id,name));
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/other/LabelsController.java
View file @ d1a86d8e
......@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -113,4 +114,13 @@ public class LabelsController extends BaseController {
return JSON.toJSONString(AjaxResult.error(500, "服务器内部错误"));
}
}
@ApiOperation("三级返回整个树")
@RequestMapping(value = "/threeToTree", method = RequestMethod.GET)
@ResponseBody
public AjaxResult threeToTree() {
List<String> codes = new ArrayList<String>();
codes.add("company_type_tec");
return commonService.threeToTree(codes);
}
}
ruoyi-admin/src/main/resources/application-dev.yml
View file @ d1a86d8e
......@@ -73,12 +73,12 @@ spring:
# redis 配置
redis:
# 地址
host: 192.168.31.185
host: redis-test.yx-street.svc.cluster.local
# 端口，默认为6379
port: 6379
# 数据库索引
database: 4
password: P@44w0rd
password: digital
# 连接超时时间
timeout: 10s
lettuce:
......@@ -97,16 +97,16 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.70.2:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: Zhuo@2023
password: P@44w0rd
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: true
url: jdbc:mysql://192.168.70.2:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: Zhuo@2023
password: P@44w0rd
# 初始连接数
initialSize: 5
# 最小连接池数量
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java
View file @ d1a86d8e
......@@ -55,4 +55,6 @@ public interface GridRegionMapper {
List<GridRegion> getAllLevelThreeByType(@Param("type") String type,@Param("code") String code);
List<GridRegion> getAllLevelFourByType(@Param("type") String type,@Param("code") String code);
int changeTreeNodeName(@Param("id") String id, @Param("name") String name);
}
\ No newline at end of file
ruoyi-system/src/main/java/com/ruoyi/system/mapper/other/LabelsMapper.java
View file @ d1a86d8e
......@@ -29,4 +29,6 @@ public interface LabelsMapper {
int updateByExample(@Param("record") Labels record, @Param("example") LabelsExample example);
List<Labels> getWgdxList(String code);
String getDegreeOne(String code);
}
\ No newline at end of file
ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
View file @ d1a86d8e
......@@ -794,6 +794,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -804,6 +805,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -826,6 +828,7 @@ public class GridRegionFacadeService {
secondNode.setName(gridRegion.getWgName());
secondNode.setWgArea(gridRegion.getWgArea());
secondNode.setLevel(gridRegion.getLevel());
secondNode.setStatus(gridRegion.getStatus());
List<GridTreeNode> childrenDocTypes = convertRegionFromWgCodeByParent(gridRegionList, gridRegion.getWgCode());
secondNode.setChild(childrenDocTypes);
models.add(secondNode);
......@@ -1172,26 +1175,31 @@ public class GridRegionFacadeService {
secondFiveTreeNode1.setName("楼宇");
secondFiveTreeNode1.setChild(new ArrayList<>());
secondFiveTreeNode1.setStatus("2");
secondFiveTreeNode1.setLevel("2.5");
GridTreeNode secondFiveTreeNode4 = new GridTreeNode();
secondFiveTreeNode4.setId(UUID.randomUUID().toString());
secondFiveTreeNode4.setName("道路");
secondFiveTreeNode4.setChild(new ArrayList<>());
secondFiveTreeNode4.setStatus("2");
secondFiveTreeNode4.setLevel("2.5");
GridTreeNode secondFiveTreeNode5 = new GridTreeNode();
secondFiveTreeNode5.setId(UUID.randomUUID().toString());
secondFiveTreeNode5.setName("街区");
secondFiveTreeNode5.setChild(new ArrayList<>());
secondFiveTreeNode5.setStatus("2");
secondFiveTreeNode5.setLevel("2.5");
GridTreeNode secondFiveTreeNode6 = new GridTreeNode();
secondFiveTreeNode6.setId(UUID.randomUUID().toString());
secondFiveTreeNode6.setName("综合体");
secondFiveTreeNode6.setChild(new ArrayList<>());
secondFiveTreeNode6.setStatus("2");
secondFiveTreeNode6.setLevel("2.5");
GridTreeNode secondFiveTreeNode7 = new GridTreeNode();
secondFiveTreeNode7.setId(UUID.randomUUID().toString());
secondFiveTreeNode7.setName("市场");
secondFiveTreeNode7.setChild(new ArrayList<>());
secondFiveTreeNode7.setStatus("2");
secondFiveTreeNode7.setLevel("2.5");
secondFiveTree.add(secondFiveTreeNode1);
secondFiveTree.add(secondFiveTreeNode4);
secondFiveTree.add(secondFiveTreeNode5);
......@@ -1235,7 +1243,7 @@ public class GridRegionFacadeService {
private GridTreeNode convertNodeToTree(GridRegion gridRegion){
GridTreeNode firstNode = new GridTreeNode();
// firstNode.setLevel("1");
firstNode.setLevel(gridRegion.getLevel());
firstNode.setCode(gridRegion.getWgCode());
firstNode.setName(gridRegion.getWgName());
firstNode.setId(gridRegion.getId());
......@@ -1248,4 +1256,99 @@ public class GridRegionFacadeService {
return firstNode;
}
public void getRolesWhereTypeZero(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result) {
if (null == pageNum || pageNum <= 0) {
pageNum = 1;
}
if (null == pageSize || pageSize <= 0) {
pageSize = 10;
}
ZQTPageModel<GridRegionWithCompanyItem> appPageModel = new ZQTPageModel<>();
appPageModel.setRecordCount(0);
appPageModel.setPageCount(0);
appPageModel.setCurPage(pageNum);
appPageModel.setItemList(new ArrayList<>());
//
// GridRegionExample example = new GridRegionExample();
// GridRegionExample.Criteria criteria = example.createCriteria();
// criteria.andIsValidEqualTo("1");
// if (StringUtils.isNotEmpty(wgName)) {
// criteria.andWgNameLike("%" + wgName + "%");
// }
//// if (StringUtils.isNotEmpty(wgType)) {
//// criteria.andWgTypeEqualTo(wgType);
//// }
// if (StringUtils.isNotEmpty(level)) {
// criteria.andLevelEqualTo(level);
// }
// if (StringUtils.isNotBlank(purpose)) {
// criteria.andWgPurposeEqualTo(purpose);
// }
// if (StringUtils.isNotEmpty(wgCode)) {
// if ("zswg".equals(wgCode)) {
// criteria.andWgTypeEqualTo("2");//查询所有专属网格
// } else {
// criteria.andWgParentIdEqualTo(wgCode);
// }
// }
//
// //加上2.5级的
// int count = gridRegionService.countByExample(example);
// if (count <= 0) {
// result.buildSuccess("success", appPageModel);
// return;
// }
// example.setOrderByClause(" wg_code");
int count = 5;
List<GridRegion> roles = new ArrayList<>();
List<String> type = new ArrayList<>();
type.add("1");
type.add("4");
type.add("5");
type.add("6");
type.add("7");
List<String> name = new ArrayList<>();
name.add("楼宇");
name.add("道路");
name.add("街区");
name.add("综合体");
name.add("市场");
for(int i=0;i<5;i++){
GridRegion gridRegion = new GridRegion();
gridRegion.setWgCode(wgCode);
gridRegion.setStatus("2");
gridRegion.setId(UUID.randomUUID().toString());
gridRegion.setWgType(type.get(i));
gridRegion.setLevel("2.5");
gridRegion.setWgName(name.get(i));
gridRegion.setIsValid("1");
roles.add(gridRegion);
}
// List<GridRegion> roles = gridRegionService.selectByExampleWithBLOBsForStartPage(example, pageNum, pageSize);
// if (null == roles || roles.isEmpty()) {
// result.buildSuccess("success", appPageModel);
// return;
// }
appPageModel.setCurPage(pageNum);
appPageModel.setRecordCount(count);
appPageModel.setPageCount((long) Math.ceil(1.0 * count / pageSize));
List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(roles, GridRegionWithCompanyItem.class);
itemList.forEach( e -> {
GridCompanyLandExample gridCompanyLandExample = new GridCompanyLandExample();
GridCompanyLandExample.Criteria gridCompanyLandExampleCriteria = gridCompanyLandExample.createCriteria();
gridCompanyLandExampleCriteria.andLandIdEqualTo(e.getId());
gridCompanyLandExampleCriteria.andIsValidEqualTo("1");
e.setCompanyCount(companyLandService.countByExample(gridCompanyLandExample));
});
appPageModel.setItemList(itemList);
result.buildSuccess("success", appPageModel);
}
}
ruoyi-system/src/main/java/com/ruoyi/system/service/other/LabelsFacadeService.java
View file @ d1a86d8e
......@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain.other.Labels;
import com.ruoyi.system.domain.other.LabelsExample;
import com.ruoyi.system.domain.other.vo.LabelsVO;
import com.ruoyi.system.mapper.other.LabelsMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -24,6 +25,9 @@ public class LabelsFacadeService {
@Autowired
private LabelsService bsCommonService;
@Autowired
private LabelsMapper labelsMapper;
public String commit(Labels body, String method) {
try {
AjaxResult result = new AjaxResult();
......@@ -276,4 +280,27 @@ public class LabelsFacadeService {
}
return item.matches("(\\w{8}(-\\w{4}){3}-\\w{12}?)");
}
public AjaxResult threeToTree(List<String> codes){
Set<String> codeSet = new HashSet<>();
List<Labels> bsCommons = new ArrayList<>();
for(String code : codes){
String degree_one = labelsMapper.getDegreeOne(code);
codeSet.add(degree_one);
}
for(String code : codeSet){
LabelsExample bsCommonExample = new LabelsExample();
LabelsExample.Criteria criteria = bsCommonExample.createCriteria();
criteria.andIsValidEqualTo("1");
if(StringUtils.isNotBlank(code)){
criteria.andCodeLike("%"+code+"%");
}
bsCommonExample.setOrderByClause(" sort + 0 ");
List<Labels> bsCommon = bsCommonService.selectByExample(bsCommonExample);
bsCommons.addAll(bsCommon);
}
List<Map<String, Object>> jsTreeModels = convertFrBomsCommon(bsCommons);
return AjaxResult.success(jsTreeModels);
}
}
ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
View file @ d1a86d8e
......@@ -22,6 +22,7 @@
<result column="ylzd4" jdbcType="VARCHAR" property="ylzd4" />
<result column="ylzd5" jdbcType="VARCHAR" property="ylzd5" />
<result column="wg_purpose" jdbcType="VARCHAR" property="wgPurpose" />
<result column="status" jdbcType="VARCHAR" property="status" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ruoyi.system.domain.grid.GridRegion">
<result column="wg_coordinate" jdbcType="LONGVARCHAR" property="wgCoordinate" />
......@@ -535,6 +536,7 @@
where id = #{id,jdbcType=VARCHAR}
</update>
<select id="selectThirdGridByBaseId" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
select * from grid_region where wg_type='1' and level='3'
</select>
......@@ -681,4 +683,9 @@
and wg_code like CONCAT(#{code}, '%')
and wg_code != #{code}
</select>
<update id="changeTreeNodeName">
update grid_region set wg_name=#{name} where id = #{id}
</update>
</mapper>
\ No newline at end of file
ruoyi-system/src/main/resources/mapper/other/LabelsMapper.xml
View file @ d1a86d8e
......@@ -219,6 +219,9 @@
<include refid="Example_Where_Clause" />
</if>
</select>
<select id="getDegreeOne" resultType="java.lang.String">
select code from labels where id = (select parent_id from labels where id = (select parent_id from labels where code = #{code}))
</select>
<update id="updateByExampleSelective" parameterType="map">
update labels
<set>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment