Skip to content

M
map-parent
Commit cda0bf13 by yangyang
Options

预警模型调整

parent 2217fab3
Showing with 72 additions and 16 deletions
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
......@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.newPublicEntity.CodeYymc.SkCodeYymc;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarning;
import com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarningRule;
......@@ -453,11 +452,70 @@ public class WarningController {
wrapper1.eq("isdeleted","0");
SkWarningRule skWarningRule = warningRuleMapper.selectOne(wrapper1);
WaringVo waringVo = new WaringVo();
BeanUtils.copyProperties(s,waringVo);
//获取class对象
Class<?> aClass = null;
WaringVo bean = null;
//实例化对象
try {
aClass = Class.forName(waringVo.getClass().getCanonicalName());
bean = (WaringVo) aClass.newInstance();
} catch (Exception e) {
e.printStackTrace();
}
// 动态set指定字段值 图例描述字段
if(StringUtils.isNotBlank(skWarningRule.getTlms())){
if(skWarningRule.getTlms().contains(",")){
String tlms[] = skWarningRule.getTlms().split(",");
Integer i = 1;
for (String c : tlms) {
try {
//遍历所有方法
PropertyDescriptor descriptor = new PropertyDescriptor("tlms"+i, aClass);
//得到set方法
Method setMethod = descriptor.getWriteMethod();
//执行set方法
setMethod.invoke(bean, c);
i ++;
} catch (Exception e) {
e.printStackTrace();
}
}
}else{
bean.setTlms1(skWarningRule.getTlms());
}
}
// 动态set指定字段值 图例描述字段
if(StringUtils.isNotBlank(skWarningRule.getTlys())){
if(skWarningRule.getTlys().contains(",")){
String tlys[] = skWarningRule.getTlys().split("\\),");
Integer i = 1;
for (String c : tlys) {
try {
//遍历所有方法
PropertyDescriptor descriptor = new PropertyDescriptor("tlys"+i, aClass);
//得到set方法
Method setMethod = descriptor.getWriteMethod();
//执行set方法
if(tlys.length == i){
setMethod.invoke(bean, c);
}else{
setMethod.invoke(bean, c+")");
}
i ++;
} catch (Exception e) {
e.printStackTrace();
}
}
}else{
bean.setTlys1(skWarningRule.getTlys());
}
}
BeanUtils.copyProperties(s,bean);
if (skWarningRule!=null){
BeanUtils.copyProperties(skWarningRule,waringVo);
BeanUtils.copyProperties(skWarningRule,bean);
}
re.add(waringVo);
re.add(bean);
});
return new MapRestResult(200,"ok",iPage.getTotal(),re);
......@@ -466,7 +524,7 @@ public class WarningController {
@PostMapping("DetialBymxbh")
@ApiOperation(value = "模型和规则详情")
//@OperLog(message = "模型和规则详情", operation = OperationType.QUERY)
@OperLog(message = "模型和规则详情", operation = OperationType.QUERY)
public MapRestResult DetialBymxbh(@RequestBody WaringVo waringVo){
QueryWrapper<SkWarning> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotEmpty(waringVo.getMxbh()),"mxbh", waringVo.getMxbh());
......@@ -503,7 +561,6 @@ public class WarningController {
} catch (Exception e) {
e.printStackTrace();
}
System.out.println(c);
}
}else{
bean.setTlms1(skWarningRule.getTlms());
......@@ -531,7 +588,6 @@ public class WarningController {
} catch (Exception e) {
e.printStackTrace();
}
System.out.println(c);
}
}else{
bean.setTlys1(skWarningRule.getTlys());
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
......@@ -67,14 +67,14 @@
SELECT COUNT(*) AS "num",xzqhdm as "xzqhdm",(select name from sys_dictitem where groupID='CODE_XZQH' AND
CODE=xzqhdm and scbz = '0') as "xzqhMc"
FROM (
select a.ASJBH,substr(a.LADW_GAJGJGDM,0,6) as xzqhdm
from tb_st_asj a inner join tb_xw_zczj b on a.asjbh=b.asjbh where a.xxsc_pdbz='0'
and a.LARQ<![CDATA[>=]]> to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.LARQ<![CDATA[<=]]> to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ<![CDATA[>=]]> to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ<![CDATA[<=]]> to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01<![CDATA[>=]]>to_date( #{startTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01<![CDATA[<=]]> to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
select a.ASJBH,LEFT(a.LADW_GAJGJGDM,6) as xzqhdm
from tb_st_asj a join tb_xw_zczj b on a.asjbh=b.asjbh where a.xxsc_pdbz='0'
and a.LARQ<![CDATA[>=]]> str_to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.LARQ<![CDATA[<=]]> str_to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ<![CDATA[>=]]> str_to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ<![CDATA[<=]]> str_to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01<![CDATA[>=]]>str_to_date( #{startTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01<![CDATA[<=]]> str_to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
<if test="xzqhdm!=null and xzqhdm!=''">
and LADW_GAJGJGDM LIKE concat(#{xzqhdm},'%')
</if>
......@@ -87,7 +87,7 @@
<if test="ajlbdm!=null and ajlbdm!=''">
and AJLBDM in (${ajlbdm})
</if>
)
)s
group by xzqhdm
</select>
<select id="selectXzqhdmBycq" resultType="com.founder.commonutils.model.newPublicEntity.SysDictitem">
......
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