Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dili
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
dili
Commits
5dd5953c
提交
5dd5953c
authored
8月 21, 2019
作者:
renjianyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
b9d0c309
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
136 行增加
和
1 行删除
+136
-1
BaseRequestPath.java
...src/main/java/com/zrqx/core/constant/BaseRequestPath.java
+2
-0
GeographyRequestPath.java
...om/zrqx/core/constant/geography/GeographyRequestPath.java
+16
-0
ApprovalEnterprise.java
...ava/com/zrqx/core/model/geography/ApprovalEnterprise.java
+1
-1
CategoryDateVo.java
...n/java/com/zrqx/core/vo/Geographysign/CategoryDateVo.java
+23
-0
GeographysignMapper.java
...eography/bg/mapper/geographysign/GeographysignMapper.java
+73
-0
GeographysignService.java
...graphy/bg/service/geographysign/GeographysignService.java
+7
-0
GeographysignServiceImpl.java
...hy/bg/service/geographysign/GeographysignServiceImpl.java
+14
-0
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/constant/BaseRequestPath.java
浏览文件 @
5dd5953c
...
...
@@ -18,6 +18,8 @@ public class BaseRequestPath {
public
static
final
String
IDSTRING
=
"id"
;
public
static
final
String
RESOURCE
=
"/resource"
;
public
static
final
String
BIGRESOURCE
=
"/bigresource"
;
// 一元
/** /{wid} 根据id获取 搭配@PathVariable使用 */
// 解决 {wid}占位符造成api冲突
...
...
com.zrqx.core/src/main/java/com/zrqx/core/constant/geography/GeographyRequestPath.java
浏览文件 @
5dd5953c
...
...
@@ -25,6 +25,9 @@ public class GeographyRequestPath extends BaseRequestPath{
/** 导入 */
public
static
final
String
DETAILED
=
"/detailed"
;
/** 分类 */
public
static
final
String
QUERY
=
"/query"
;
...
...
@@ -56,6 +59,19 @@ public class GeographyRequestPath extends BaseRequestPath{
/**key明细 */
public
static
final
String
KEYPDETAILED
=
"/keypdetailed"
;
/** 大屏地理标志 */
public
static
final
String
GEOGRAPHYSIGN
=
"/geographysign"
;
/** 大屏曲线图 */
public
static
final
String
DIAGRAM
=
"/diagram"
;
/** 大屏地理标志申请机构 */
public
static
final
String
APPLICANTAGENCY
=
"/applicantagency"
;
/** 大屏省市县数量 */
public
static
final
String
PROVINCECOUNT
=
"/provincecount"
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/model/geography/ApprovalEnterprise.java
浏览文件 @
5dd5953c
...
...
@@ -61,7 +61,7 @@ public class ApprovalEnterprise {
@ApiModelProperty
(
" 1:未爬数据 2:已爬数据 3:数据有问题"
)
private
String
ReptileState
;
@ApiModelProperty
(
"冗余字段1"
)
@ApiModelProperty
(
"冗余字段1
,品类类型
"
)
private
String
reserve1
;
@ApiModelProperty
(
"冗余字段2,区分sorl查询用的字段"
)
...
...
com.zrqx.core/src/main/java/com/zrqx/core/vo/Geographysign/CategoryDateVo.java
0 → 100644
浏览文件 @
5dd5953c
package
com
.
zrqx
.
core
.
vo
.
Geographysign
;
import
java.util.List
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"CategoryDateVo"
,
description
=
"查询分类返回数组Vo"
)
public
class
CategoryDateVo
{
@ApiModelProperty
(
value
=
"品类名称"
)
List
<
String
>
category
;
@ApiModelProperty
(
value
=
"注册数量"
)
List
<
Integer
>
registerNumber
;
@ApiModelProperty
(
value
=
"核准企业数量"
)
List
<
Integer
>
approvalNumber
;
}
com.zrqx.geography/src/main/java/com/zrqx/geography/bg/mapper/geographysign/GeographysignMapper.java
浏览文件 @
5dd5953c
...
...
@@ -283,6 +283,79 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
+
" group by province"
+
"</script>"
)
List
<
ProvinceVo
>
provincecount
(
@Param
(
"form"
)
GeographyForm
form
);
/** 大屏柱状图分类*/
@Select
(
"<script>"
+
"select reserve1 name from dl_geographysign where 1 = 1"
+
"<if test='"
+
NOTBLANK
+
"(form.province) '>"
+
" and province = #{form.province} "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.city)'>"
+
"and city = #{form.city}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.county)'>"
+
"and county = #{form.county}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.signstate)'>"
+
"and signstate = #{form.signstate}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.categoryOne)'>"
+
"and reserve1 = #{form.categoryOne}"
+
"</if>"
+
" GROUP BY reserve1 ORDER BY reserve1 desc"
+
"</script>"
)
List
<
String
>
categorystate
(
@Param
(
"form"
)
GeographyForm
form
);
/** 大屏柱状图注册数据*/
@Select
(
"<script>"
+
"select count(reserve1) from dl_geographysign where 1 = 1 and registerState = '已注册'"
+
"<if test='"
+
NOTBLANK
+
"(form.province) '>"
+
" and province = #{form.province} "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.city)'>"
+
"and city = #{form.city}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.county)'>"
+
"and county = #{form.county}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.signstate)'>"
+
"and signstate = #{form.signstate}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.categoryOne)'>"
+
"and reserve1 = #{form.categoryOne}"
+
"</if>"
+
" GROUP BY reserve1 ORDER BY reserve1 desc"
+
"</script>"
)
List
<
Integer
>
registerNumber
(
@Param
(
"form"
)
GeographyForm
form
);
/** 大屏柱状图核准企业数量*/
@Select
(
"<script>"
+
"select count(reserve1) from dl_approvalenterprise where 1 = 1 "
+
"<if test='"
+
NOTBLANK
+
"(form.province) '>"
+
" and province = #{form.province} "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.city)'>"
+
"and city = #{form.city}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.county)'>"
+
"and county = #{form.county}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.signstate)'>"
+
"and signstate = #{form.signstate}"
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.categoryOne)'>"
+
"and reserve1 = #{form.categoryOne}"
+
"</if>"
+
" GROUP BY reserve1 ORDER BY reserve1 desc"
+
"</script>"
)
List
<
Integer
>
approvalNumber
(
@Param
(
"form"
)
GeographyForm
form
);
}
com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignService.java
浏览文件 @
5dd5953c
...
...
@@ -10,6 +10,7 @@ import com.zrqx.core.util.CallBack;
import
com.zrqx.core.util.PageInfo
;
import
com.zrqx.core.util.PageParam
;
import
com.zrqx.core.vo.Geographysign.CaregoryVo
;
import
com.zrqx.core.vo.Geographysign.CategoryDateVo
;
import
com.zrqx.core.vo.Geographysign.CountyVo
;
import
com.zrqx.core.vo.Geographysign.GeographysignVo
;
import
com.zrqx.core.vo.Geographysign.ProvinceQueryVo
;
...
...
@@ -114,6 +115,12 @@ public interface GeographysignService extends BaseService<Geographysign, String>
*/
List
<
ProvinceVo
>
provincecount
(
GeographyForm
form
);
/**
* 查询大屏品类树状图数据
* @return
*/
CategoryDateVo
querycategory
(
GeographyForm
form
);
...
...
com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignServiceImpl.java
浏览文件 @
5dd5953c
...
...
@@ -21,6 +21,7 @@ import com.zrqx.core.util.CallBack;
import
com.zrqx.core.util.PageInfo
;
import
com.zrqx.core.util.PageParam
;
import
com.zrqx.core.vo.Geographysign.CaregoryVo
;
import
com.zrqx.core.vo.Geographysign.CategoryDateVo
;
import
com.zrqx.core.vo.Geographysign.CountyTwoVo
;
import
com.zrqx.core.vo.Geographysign.CountyVo
;
import
com.zrqx.core.vo.Geographysign.GeographysignVo
;
...
...
@@ -250,4 +251,17 @@ public class GeographysignServiceImpl extends BaseServiceImpl<Geographysign, Str
return
mapper
.
provincecount
(
form
);
}
@Override
public
CategoryDateVo
querycategory
(
GeographyForm
form
)
{
CategoryDateVo
category
=
new
CategoryDateVo
();
//品类类型
category
.
setCategory
(
mapper
.
categorystate
(
form
));
//品类注册数量
category
.
setRegisterNumber
(
mapper
.
registerNumber
(
form
));
//品类核准企业数量
category
.
setApprovalNumber
(
mapper
.
approvalNumber
(
form
));
return
category
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论