Skip to content

S
sv-springboot
Commit 8192b1a0 by Suvalue
Options

20200909更细，新增指标查询页面

parent cc94c181
Showing with 271 additions and 268 deletions
hs-api/src/main/java/com/hs/api/controller/IndController.java
package com.hs.api.controller;
import com.hs.api.common.Result;
import com.hs.api.model.DicIndInfo;
import com.hs.api.service.DicIndService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
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 org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@ApiIgnore
@RequestMapping("ind")
@Controller
@Api(tags = "指标查询")
@RestController
public class IndController {
@Autowired
private DicIndService dicIndService;
@GetMapping
public ModelAndView index(Model model,String filter) {
model.addAttribute("title","指标搜索");
model.addAttribute("indList",dicIndService.selectAll(filter));
model.addAttribute("filter",filter == null ? "" : filter);
ModelAndView mav = new ModelAndView("ind","indModel",model);
return mav;
}
// @GetMapping
// public ModelAndView index(Model model, String filter) {
// model.addAttribute("title", "指标搜索");
// model.addAttribute("indList", dicIndService.selectAll(filter));
// model.addAttribute("filter", filter == null ? "" : filter);
// ModelAndView mav = new ModelAndView("ind", "indModel", model);
// return mav;
// }
//
// @PostMapping("search")
// public ModelAndView search(String filter) {
// return new ModelAndView("redirect:/ind?filter=" + filter);
// }
@PostMapping("search")
public ModelAndView search(String filter) {
return new ModelAndView("redirect:/ind?filter=" + filter);
@GetMapping("ind/find")
public Object find(Integer pageCode, String filter) {
List<DicIndInfo> list = dicIndService.selectAll(pageCode, filter);
return Result.success(list);
}
}
hs-api/src/main/java/com/hs/api/mapper/DicIndMapper.java deleted 100644 → 0
package com.hs.api.mapper;
import com.hs.api.model.DicInd;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DicIndMapper {
int deleteByPrimaryKey(Long id);
int insert(DicInd record);
DicInd selectByPrimaryKey(Long id);
List<DicInd> selectAll();
List<DicInd> selectAllByFilter(@Param("filter") String filter);
int updateByPrimaryKey(DicInd record);
}
\ No newline at end of file
hs-api/src/main/java/com/hs/api/model/DicInd.java deleted 100644 → 0
package com.hs.api.model;
import java.util.Date;
public class DicInd {
private Long id;
private Date createDate;
private Long createUserid;
private Long state;
private String indCode;
private String indName;
private String indField;
private Short computeMode;
private String columnType;
private String execSql;
private String describe;
private String checkSql;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Long getCreateUserid() {
return createUserid;
}
public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid;
}
public Long getState() {
return state;
}
public void setState(Long state) {
this.state = state;
}
public String getIndCode() {
return indCode;
}
public void setIndCode(String indCode) {
this.indCode = indCode;
}
public String getIndName() {
return indName;
}
public void setIndName(String indName) {
this.indName = indName;
}
public String getIndField() {
return indField;
}
public void setIndField(String indField) {
this.indField = indField;
}
public Short getComputeMode() {
return computeMode;
}
public void setComputeMode(Short computeMode) {
this.computeMode = computeMode;
}
public String getColumnType() {
return columnType;
}
public void setColumnType(String columnType) {
this.columnType = columnType;
}
public String getExecSql() {
return execSql;
}
public void setExecSql(String execSql) {
this.execSql = execSql;
}
public String getDescribe() {
return describe;
}
public void setDescribe(String describe) {
this.describe = describe;
}
public String getCheckSql() {
return checkSql;
}
public void setCheckSql(String checkSql) {
this.checkSql = checkSql;
}
}
\ No newline at end of file
hs-api/src/main/java/com/hs/api/service/DicIndService.java
package com.hs.api.service;
import com.hs.api.model.DicInd;
import com.hs.api.model.DicIndInfo;
import java.util.List;
public interface DicIndService extends ServiceBase<DicInd> {
List<DicInd> selectAll(String filter);
public interface DicIndService extends ServiceBase<DicIndInfo> {
List<DicIndInfo> selectAll(Integer pageCode, String filter);
}
hs-api/src/main/java/com/hs/api/service/Impl/DicIndServiceImpl.java
package com.hs.api.service.Impl;
import com.hs.api.mapper.DicIndMapper;
import com.hs.api.model.DicInd;
import com.hs.api.mapper.DicIndInfoMapper;
import com.hs.api.model.DicIndInfo;
import com.hs.api.service.DicIndService;
import org.springframework.stereotype.Service;
......@@ -11,20 +11,20 @@ import java.util.List;
@Service
public class DicIndServiceImpl implements DicIndService {
@Resource
private DicIndMapper dicIndMapper;
private DicIndInfoMapper dicIndMapper;
@Override
public int add(DicInd dicInd) {
public int add(DicIndInfo dicInd) {
return dicIndMapper.insert(dicInd);
}
@Override
public List<DicInd> findAll() {
public List<DicIndInfo> findAll() {
return dicIndMapper.selectAll();
}
@Override
public DicInd find(Long id) {
public DicIndInfo find(Long id) {
return dicIndMapper.selectByPrimaryKey(id);
}
......@@ -39,13 +39,13 @@ public class DicIndServiceImpl implements DicIndService {
}
@Override
public int update(DicInd dicInd) {
public int update(DicIndInfo dicInd) {
return dicIndMapper.updateByPrimaryKey(dicInd);
}
@Override
public List<DicInd> selectAll(String filter) {
List<DicInd> list = dicIndMapper.selectAllByFilter(filter);
public List<DicIndInfo> selectAll(Integer pageCode, String filter) {
List<DicIndInfo> list = dicIndMapper.selectAllByFilter(pageCode, filter);
return list;
}
......
hs-api/src/main/java/com/hs/api/unusecontroller/DicIndController.java
......@@ -3,7 +3,7 @@ package com.hs.api.unusecontroller;
import com.hs.api.common.base.RequestResult;
import com.hs.api.common.enums.RequestResultType;
import com.hs.api.model.DicDim;
import com.hs.api.model.DicInd;
import com.hs.api.model.DicIndInfo;
import com.hs.api.model.respmodel.ListPage;
import com.hs.api.service.DicIndService;
import io.swagger.annotations.Api;
......@@ -25,13 +25,13 @@ public class DicIndController {
@GetMapping("list")
public Object list() {
List<DicInd> list = dicIndService.findAll();
List<DicIndInfo> list = dicIndService.findAll();
return new RequestResult(RequestResultType.SUCCESS.getValue(),RequestResultType.SUCCESS.getDesc(),list);
}
@GetMapping("listpage")
public Object listpage(Integer pageSize,Integer pageIndex) {
List<DicInd> list = dicIndService.findAll();
List<DicIndInfo> list = dicIndService.findAll();
ListPage<DicDim> listPage = new ListPage(list,pageSize,pageIndex,0);
return new RequestResult(RequestResultType.SUCCESS.getValue(),RequestResultType.SUCCESS.getDesc(),list);
}
......@@ -43,13 +43,13 @@ public class DicIndController {
}
@PostMapping("add")
public Object add(DicInd dicInd) {
public Object add(DicIndInfo dicInd) {
dicIndService.add(dicInd);
return new RequestResult(RequestResultType.SUCCESS.getValue(),RequestResultType.SUCCESS.getDesc(),null);
}
@PostMapping("update")
public Object update(DicInd dicInd) {
public Object update(DicIndInfo dicInd) {
dicIndService.update(dicInd);
return new RequestResult(RequestResultType.SUCCESS.getValue(),RequestResultType.SUCCESS.getDesc(),null);
}
......
hs-api/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
spring.datasource.url=jdbc:mysql://192.168.18.178:3306/scml_zp_cs_2.1?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy2.1_org?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
......
hs-api/src/main/resources/mapper/DicIndMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hs.api.mapper.DicIndMapper">
<resultMap id="BaseResultMap" type="com.hs.api.model.DicInd">
<result column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
<result column="STATE" jdbcType="DECIMAL" property="state"/>
<result column="IND_CODE" jdbcType="VARCHAR" property="indCode"/>
<result column="IND_NAME" jdbcType="VARCHAR" property="indName"/>
<result column="IND_FIELD" jdbcType="VARCHAR" property="indField"/>
<result column="COMPUTE_MODE" jdbcType="DECIMAL" property="computeMode"/>
<result column="COLUMN_TYPE" jdbcType="VARCHAR" property="columnType"/>
<result column="EXEC_SQL" jdbcType="VARCHAR" property="execSql"/>
<result column="DESCRIBE" jdbcType="VARCHAR" property="describe"/>
<result column="CHECK_SQL" jdbcType="VARCHAR" property="checkSql"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete
from dic_ind_info
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.DicInd">
insert into dic_ind_info (CREATE_DATE, CREATE_USERID, `STATE`,
IND_CODE, IND_NAME, COMPUTE_MODE,
EXEC_SQL, `DESCRIBE`)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{indCode,jdbcType=VARCHAR}, #{indName,jdbcType=VARCHAR}, #{computeMode,jdbcType=DECIMAL},
#{execSql,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR})
</insert>
<update id="updateByPrimaryKey" parameterType="com.hs.api.model.DicInd">
update dic_ind_info
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
IND_CODE = #{indCode,jdbcType=VARCHAR},
IND_NAME = #{indName,jdbcType=VARCHAR},
COMPUTE_MODE = #{computeMode,jdbcType=DECIMAL},
EXEC_SQL = #{execSql,jdbcType=VARCHAR},
`DESCRIBE` = #{describe,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
IND_CODE,
IND_NAME,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
from dic_ind_info
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
IND_CODE,
IND_NAME,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
from dic_ind_info
</select>
<select id="selectAllByFilter" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
IND_CODE,
IND_NAME,
IND_FIELD,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
from dic_ind_info
where INSTR(IND_NAME, #{filter,jdbcType=VARCHAR}) > 0
or INSTR(IND_FIELD, #{filter,jdbcType=VARCHAR}) > 0
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/static/ind/css/ind.css 0 → 100644
.table {
border-collapse: collapse;
margin: 0 auto;
text-align: center;
}
.table td, table th {
border: 1px solid #cad9ea;
color: #666;
height: 30px;
}
.table thead th {
background-color: #CCE8EB;
width: 100px;
}
.table tr:nth-child(odd) {
background: #fff;
}
.table tr:nth-child(even) {
background: #F5FAFA;
}
.filterTxt {
font-size: 15px;
letter-spacing: 2px;
border: 2px solid black;
padding: 5px 0px 3px 0px;
margin: 4px 0px 4px 150px;
text-align: center;
height: 24px;
width: 28%;
}
.subBtn {
width: 5%;
height: 34px;
color: white;
background-color: cornflowerblue;
border-radius: 0px;
border-width: 1px;
margin: -2px;
outline: seagreen;
font-family: "Microsoft YaHei UI";
font-size: 20px;
text-align: center;
cursor: pointer;
}
.returnBtn {
width: 8%;
height: 34px;
color: white;
background-color: cornflowerblue;
border-radius: 0px;
border-width: 1px;
margin: 4px 0px 4px -220px;
outline: seagreen;
font-family: "Microsoft YaHei UI";
font-size: 20px;
text-align: center;
cursor: pointer;
}
\ No newline at end of file
hs-api/src/main/resources/static/ind/data_index.html 0 → 100644
<!DOCTYPE html >
<html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>指标库</title>
<link rel="stylesheet" href="css/ind.css">
<script src="js/jquery-3.4.1.js"></script>
<script src="js/index.js"></script>
</head>
<body>
<div style="text-align: center">
<h1 id="page_title">###</h1>
<input type="button" class="returnBtn" value="返回主菜单" onclick="window.location.href='index.html'">
<input type="text" name="filter" onkeypress="getKey()" class="filterTxt" placeholder="请输入指标名称或指标字段名。。。"/>
<input type="button" class="subBtn" value="查询" onclick="GetIndSelect($('.filterTxt').val())">
</div>
<div style="margin-top: 20px">
<table width="80%" class="table">
<thead>
<tr>
<th>编码</th>
<th>名称</th>
<th>字段名</th>
<th>展示字段名</th>
<th>计算公式</th>
</tr>
</thead>
<tbody id="ind_list">
<tr>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
\ No newline at end of file
hs-api/src/main/resources/static/ind/index.html 0 → 100644
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>指标库</title>
</head>
<style>
.subBtn {
width: 10%;
height: 50px;
color: white;
background-color: cornflowerblue;
border-radius: 25px;
border-width: 1px;
margin: 15px;
outline: seagreen;
font-family: "Microsoft YaHei UI";
font-size: 20px;
text-align: center;
cursor: pointer;
}
</style>
<body>
<div style="text-align: center">
<h1>请选择模块</h1>
<input type="button" class="subBtn" value="能效/费用分析"
onclick="window.location.href='data_index.html?pageCode=1&pageName='+this.value">
<input type="button" class="subBtn" value="医保分析"
onclick="window.location.href='data_index.html?pageCode=3&pageName='+this.value">
<br>
<input type="button" class="subBtn" value="成本分析"
onclick="window.location.href='data_index.html?pageCode=4&pageName='+this.value">
<input type="button" class="subBtn" value="绩效考核"
onclick="window.location.href='data_index.html?pageCode=5&pageName='+this.value">
<input type="button" class="subBtn" value="通用报表"
onclick="window.location.href='data_index.html?pageCode=11&pageName='+this.value">
</div>
</body>
</html>
\ No newline at end of file
hs-api/src/main/resources/static/ind/js/index.js 0 → 100644
const apiUrl = "/";
const hTitle = "指标库";
let pageCode = 1;
let pageName = "疾病分析";
$(function () {
pageCode = GetQueryValue("pageCode");
pageName = GetQueryValue("pageName");
$("#page_title").html(pageName + " " + hTitle);
GetIndSelect();
})
/**
* 指标列表
*/
function GetIndSelect(filter) {
$.ajax({
url: apiUrl + "ind/find",
type: "GET",
data: {'pageCode': pageCode, 'filter': filter},
contentType: "application/json",
success: function (result) {
$("#ind_list tr").remove();
if (result.code === 1) {
for (let i = 0; i < result.data.length; i++) {
let calculateWay = result.data[i].calculateWay;
if (calculateWay == 'null' || calculateWay == null) {
calculateWay = '';
}
let td_content = "<tr>" +
"<td>" + result.data[i].indCode + "</td>" +
"<td>" + result.data[i].indName + "</td>" +
"<td>" + result.data[i].indField + "</td>" +
"<td>" + result.data[i].showField + "</td>" +
"<td>" + calculateWay + "</td>" +
"</tr>";
$("#ind_list").append(td_content);
}
}
}
});
}
function GetQueryValue(queryName) {
var query = decodeURI(window.location.search.substring(1));
var vars = query.split("&");
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
if (pair[0] == queryName) {
return pair[1];
}
}
return null;
}
function getKey() {
if (event.keyCode == 13) {
GetIndSelect($(".filterTxt").val());
}
}
\ No newline at end of file
hs-api/src/main/resources/static/ind/js/jquery-3.4.1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
hs-api/src/main/resources/templates/ind.html
......@@ -70,6 +70,8 @@
<th>编码</th>
<th>名称</th>
<th>字段名</th>
<th>展示字段名</th>
<th>计算公式</th>
</tr>
</thead>
<tbody>
......@@ -80,6 +82,8 @@
<td th:text="${ind.indCode}"></td>
<td th:text="${ind.indName}"></td>
<td th:text="${ind.indField}"></td>
<td th:text="${ind.showField}"></td>
<td th:text="${ind.calculateWay}"></td>
</tr>
</tbody>
</table>
......
hs-api/src/main/resources/更新日志.txt
时间：2020.09.08 版本号：2.02.0908001
时间：2020.09.09 版本号：2.02.0909001
时间：2020.09.09 版本号：2.02.0909001
后端更新说明
新增指标查询页面
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.08 版本号：2.02.0908002
前端更新说明
图表echarts 图中间趋势图排序与右侧对应
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.08 版本号：2.02.0908001
前端更新说明
......@@ -6,7 +16,7 @@
时间：2020.09.06 版本号：2.02.0906001
前端更新说明
668 加一个等号
668 加一个等号
667 病组名字放在横线上面
666 医保的收支比偏，浮框增加该指标
665 说明的文字更新
......
hs-api/src/test/resources/generatorConfig.xml
......@@ -36,13 +36,13 @@
</jdbcConnection>
<!-- <javaTypeResolver type="JavaTypeResolverImpl"/>-->
<!-- 生成实体类配置 -->
<javaModelGenerator targetPackage="com.bsoft.api.model" targetProject="src/main/java"/>
<javaModelGenerator targetPackage="com.hs.api.model" targetProject="src/main/java"/>
<!-- 生成映射文件配置 -->
<sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"/>
<!-- 生成映射接口配置 -->
<javaClientGenerator targetPackage="com.bsoft.api.mapper" targetProject="src/main/java" type="XMLMAPPER"/>
<javaClientGenerator targetPackage="com.hs.api.mapper" targetProject="src/main/java" type="XMLMAPPER"/>
<table tableName="sys_version">
<table tableName="dic_ind_info">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
......
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