jtoms пре 4 година
родитељ
комит
09b622669d

+ 0 - 31
README.md

@@ -1,34 +1,3 @@
 ```
-DELETE FROM dict_city WHERE grade=5;
-DELETE FROM dict_city WHERE full_name='市辖区' AND children_num =1
-SELECT * FROM dict_city WHERE full_name='市辖区' AND children_num >0
 
-DELETE FROM `dict_city` WHERE  `id`='1101';
-UPDATE dict_city SET parent_id='11',grade=2 WHERE parent_id='1101';
-UPDATE dict_city SET grade=3 WHERE id LIKE '1101%' AND grade=4;
-
-
-DELETE FROM `dict_city` WHERE  `id`='1201';
-UPDATE dict_city SET parent_id='12',grade=2 WHERE parent_id='1201';
-UPDATE dict_city SET grade=3 WHERE id LIKE '1201%' AND grade=4;
-
-
-DELETE FROM `dict_city` WHERE  `id`='3101';
-UPDATE dict_city SET parent_id='31',grade=2 WHERE parent_id='3101';
-UPDATE dict_city SET grade=3 WHERE id LIKE '3101%' AND grade=4;
-
-
-DELETE FROM `dict_city` WHERE  `id`='5001';
-UPDATE dict_city SET parent_id='50',grade=2 WHERE parent_id='5001';
-UPDATE dict_city SET grade=3 WHERE id LIKE '5001%' AND grade=4;
-
-
-DELETE FROM `dict_city` WHERE  `id`='620201';
-UPDATE dict_city SET parent_id='6202',grade=3 WHERE parent_id='620201';
-
-update dict_city SET children_num=0 WHERE parent_id like '1101%' AND grade=3;
-update dict_city SET children_num=0 WHERE parent_id like '1201%' AND grade=3;
-update dict_city SET children_num=0 WHERE parent_id like '3101%' AND grade=3;
-update dict_city SET children_num=0 WHERE parent_id like '5001%' AND grade=3;
-UPDATE dict_city SET children_num=0 WHERE parent_id='6202';
 ```

+ 2 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/PlaceCategoryExtendColumnController.java

@@ -37,6 +37,8 @@ public class PlaceCategoryExtendColumnController {
 
         QueryWrapper<PlaceCategoryExtendColumn> wrapper = new QueryWrapper<>();
 
+        wrapper.eq("category_id", param.getCategoryId());
+        
         if (StringUtils.isNotBlank(param.getFieldKey())) {
             wrapper.eq("field_key", param.getFieldKey());
         }

+ 1 - 0
src/main/java/com/zhiqiyun/open/mvc/params/place/QueryPlaceCategoryExtendColumnParam.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class QueryPlaceCategoryExtendColumnParam extends QueryPageParams {
+    private Long categoryId;
     private String fieldKey;
     private String fieldLabel;
 }

+ 3 - 3
src/main/resources/application.properties

@@ -6,9 +6,9 @@ logger.root.level=DEBUG
 logger.root.path=/tmp/
 ####################### mysql ###############################
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.106.38.249:3336/liucheng_open?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.username=app
-spring.datasource.password=!@qwaszx
+spring.datasource.url=jdbc:mysql://rm-bp1e2451m5olnc4g6qo.mysql.rds.aliyuncs.com/liucheng_open?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.username=liucheng
+spring.datasource.password=liucheng123@
 #######################mybatis###############################
 mybatis-plus.config-location=classpath:mybatis/sqlMapConfig.xml
 mybatis-plus.mapper-locations=classpath:mybatis/mappers/*.xml

+ 1 - 1
src/main/resources/db/migration/V1.0.0__init_db.sql

@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `authority_info`
 (
     `id`        bigint(20)   NOT NULL,
     `parent_id` bigint(20)   NOT NULL COMMENT '上级ID',
-    `name`      varchar(32)  NOT NULL COMMENT '权限名称',
+    `name`      varchar(100)  NOT NULL COMMENT '权限名称',
     `remark`    varchar(255) NOT NULL COMMENT '权限说明',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB COMMENT ='平台权限表';

Разлика између датотеке није приказан због своје велике величине
+ 43 - 0
src/main/resources/db/migration/V1.0.8__dict_city.sql


+ 25 - 0
src/main/resources/db/migration/V1.0.9__fix_dict_cidy.sql

@@ -0,0 +1,25 @@
+DELETE FROM dict_city WHERE grade=5;
+DELETE FROM dict_city WHERE full_name='市辖区' AND children_num=0;
+
+DELETE FROM `dict_city` WHERE  `id`='1101';
+UPDATE dict_city SET parent_id='11',grade=2 WHERE parent_id='1101';
+UPDATE dict_city SET children_num=0,grade=3 WHERE id LIKE '1101%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='1201';
+UPDATE dict_city SET parent_id='12',grade=2 WHERE parent_id='1201';
+UPDATE dict_city SET children_num=0,grade=3 WHERE id LIKE '1201%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='3101';
+UPDATE dict_city SET parent_id='31',grade=2 WHERE parent_id='3101';
+UPDATE dict_city SET children_num=0,grade=3 WHERE id LIKE '3101%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='5001';
+UPDATE dict_city SET parent_id='50',grade=2 WHERE parent_id='5001';
+UPDATE dict_city SET children_num=0,grade=3 WHERE id LIKE '5001%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='620201';
+UPDATE dict_city SET parent_id='6202',children_num=0,grade=3,children_num=0 WHERE parent_id='620201';

Неке датотеке нису приказане због велике количине промена